Merge pull request #226 from dalogsdon/report-height-computation

Report fix: proper empty cell computation
jupyter · Apr 19, 2016 · ef348d8 · ef348d8
2 parents cd5a64c + 160a526
commit ef348d8
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 23 deletions.
diff --git a/jupyter_dashboards/nbextension/notebook/dashboard-view/layout/grid/layout.js b/jupyter_dashboards/nbextension/notebook/dashboard-view/layout/grid/layout.js
@@ -70,8 +70,8 @@ define([
             ];
         }
 
-        // Must wait for CSS to be evaluated before we generate the grid. Otherwise, positioning
-        // is calculated incorrectly.
+        // Must wait for CSS to be evaluated before we generate the grid.
+        // Otherwise, positioning is calculated incorrectly.
         $.when.apply(null, cssLoaded).then(function() {
             var nolayout = this._addMetadataToDom(); // returns cells that don't have metadata
 

diff --git a/jupyter_dashboards/nbextension/notebook/dashboard-view/layout/report/layout.js b/jupyter_dashboards/nbextension/notebook/dashboard-view/layout/report/layout.js
@@ -26,31 +26,34 @@ define([
         this.$container = opts.$container;
 
         if (!cssLoaded) {
-            cssLoaded = [
-                linkCSS('./dashboard-view/layout/report/layout.css')
-            ];
+            cssLoaded = linkCSS('./dashboard-view/layout/report/layout.css');
         }
 
         Metadata.dashboardLayout = Metadata.DASHBOARD_LAYOUT.REPORT;
 
-        // setup cells for report layout
-        var self = this;
-        this.$container.find('.cell').each(function() {
-            var $cell = $(this);
-
-            // hide cell if empty
-            if ($cell.height() === 0 && !Metadata.getCellLayout($cell)) {
-                Metadata.hideCell($cell);
-            }
-
-            // set hidden state
-            $cell.toggleClass('dashboard-hidden dashboard-collapsed', !Metadata.isCellVisible($cell));
-
-            // add controle for hide, add, edit
-            self._addCellControls($cell);
-
-            self._updateCollapseBtns();
-        });
+        $.when(cssLoaded).then(function() {
+            // setup cells for report layout
+            var self = this;
+            this.$container.find('.cell')
+                .css('min-height', '0px') // we detect empty cells by height
+                .each(function() {
+                    var $cell = $(this);
+
+                    // hide cell if empty
+                    if ($cell.height() === 0 && !Metadata.getCellLayout($cell)) {
+                        Metadata.hideCell($cell);
+                    }
+
+                    // set hidden state
+                    $cell.toggleClass('dashboard-hidden dashboard-collapsed', !Metadata.isCellVisible($cell));
+
+                    // add controle for hide, add, edit
+                    self._addCellControls($cell);
+
+                    self._updateCollapseBtns();
+                })
+                .css('min-height','');
+        }.bind(this));
     }
 
     ReportLayout.prototype._addCellControls = function($cell) {