commit 06811b7efe9db78feb84106e4ca4e061466a49b6
author Simon Hunt <simon@onlab.us> Tue Nov 25 18:54:48 2014 -0800
committer Gerrit Code Review <gerrit@onlab.us> Wed Nov 26 03:21:34 2014 +0000
tree 9fc4d59b0c8c8043c5f553c687f6d96ad91be7f8
parent 119fd5c5a5e4db45d87269bf99b5d18588361449

GUI -- [ONOS-318] - Detail pane moves into space vacated by summary pane; makes room for incoming summary...

Change-Id: I1dd9af05bdb18cb8cf2c51b1dca3b2cfd09d9e37

web/gui/src/main/webapp/onos.js

diff --git a/web/gui/src/main/webapp/onos.js b/web/gui/src/main/webapp/onos.js
index cc595a9..53d68f6 100644
--- a/web/gui/src/main/webapp/onos.js
+++ b/web/gui/src/main/webapp/onos.js
@@ -825,6 +825,8 @@
                     return noPx('height');
                 }
 
+                function noop() {}
+
                 fp = {
                     id: id,
                     el: el,
@@ -833,17 +835,19 @@
                         return on;
                     },
 
-                    show: function () {
-                        console.log('show pane: ' + id);
+                    show: function (cb) {
+                        var endCb = isF(cb) || noop;
                         on = true;
                         el.transition().duration(750)
+                            .each('end', endCb)
                             .style(cfg.side, pxShow())
                             .style('opacity', 1);
                     },
-                    hide: function () {
-                        console.log('hide pane: ' + id);
+                    hide: function (cb) {
+                        var endCb = isF(cb) || noop;
                         on = false;
                         el.transition().duration(750)
+                            .each('end', endCb)
                             .style(cfg.side, pxHide())
                             .style('opacity', 0);
                     },

web/gui/src/main/webapp/topo.js

diff --git a/web/gui/src/main/webapp/topo.js b/web/gui/src/main/webapp/topo.js
index e212f95..5b38483 100644
--- a/web/gui/src/main/webapp/topo.js
+++ b/web/gui/src/main/webapp/topo.js
@@ -770,13 +770,13 @@
     function showSummary(data) {
         evTrace(data);
         populateSummary(data.payload);
-        summaryPane.show();
+        showSummaryPane();
     }
 
     function showDetails(data) {
         evTrace(data);
         populateDetails(data.payload);
-        detailPane.show();
+        showDetailPane();
     }
 
     function showTraffic(data) {
@@ -901,9 +901,39 @@
 
     function cancelSummary() {
         sendMessage('cancelSummary', {});
-        summaryPane.hide();
+        hideSummaryPane();
     }
 
+    // encapsulate interaction between summary and details panes
+    function showSummaryPane() {
+        if (detailPane.isVisible()) {
+            detailPane.down(summaryPane.show);
+        } else {
+            summaryPane.show();
+        }
+    }
+
+    function hideSummaryPane() {
+        summaryPane.hide(function () {
+            if (detailPane.isVisible()) {
+                detailPane.up();
+            }
+        });
+    }
+
+    function showDetailPane() {
+        if (summaryPane.isVisible()) {
+            detailPane.down(detailPane.show);
+        } else {
+            detailPane.up(detailPane.show);
+        }
+    }
+
+    function hideDetailPane() {
+        detailPane.hide();
+    }
+
+
     // request details for the selected element
     // invoked from selection of a single node.
     function requestDetails() {
@@ -2191,7 +2221,7 @@
     }
 
     function emptySelect() {
-        detailPane.hide();
+        hideDetailPane();
         cancelTraffic();
     }
 
@@ -2697,6 +2727,30 @@
         return 'translate('+((w-bdim)*.4)+','+((h-bdim)*.1)+')';
     }
 
+    function isF(f) { return $.isFunction(f) ? f : null; }
+    function noop() {}
+
+    function augmentDetailPane() {
+        var dp = detailPane;
+        dp.ypos = { up: 64, down: 320, current: 320};
+
+        dp._move = function (y, cb) {
+            var endCb = isF(cb) || noop,
+                yp = dp.ypos;
+            if (yp.current !== y) {
+                yp.current = y;
+                dp.el.transition().duration(300)
+                    .each('end', endCb)
+                    .style('top', yp.current + 'px');
+            } else {
+                endCb();
+            }
+        };
+
+        dp.down = function (cb) { dp._move(dp.ypos.down, cb); };
+        dp.up = function (cb) { dp._move(dp.ypos.up, cb); };
+    }
+
     // ==============================
     // View registration
 
@@ -2710,6 +2764,7 @@
 
     summaryPane = onos.ui.addFloatingPanel('topo-summary');
     detailPane = onos.ui.addFloatingPanel('topo-detail');
+    augmentDetailPane();
     oiBox = onos.ui.addFloatingPanel('topo-oibox', 'TL');
     oiBox.width(20);