GUI -- Navigation Pane canceled with Escape key.

- Also, fixed color of drop shadow on .dark navigation pane.

Change-Id: I43fa58923158ad3f637e9f8c3dbd50043e89176e

@@ -34,7 +34,7 @@
 }
 }
 .dark #nav {
 .dark #nav {
     background-color: #444;
     background-color: #444;
-    box-shadow: 0 2px 8px #555;
+    box-shadow: 0 2px 8px #111;
 }
 }
 
 
 #nav a {
 #nav a {

@@ -44,6 +44,13 @@
         navShown = !navShown;
         navShown = !navShown;
         updatePane();
         updatePane();
     }
     }
+    function hideIfShown() {
+        if (navShown) {
+            hideNav();
+            return true;
+        }
+        return false;
+    }
 
 
     angular.module('onosNav', [])
     angular.module('onosNav', [])
         .controller('NavCtrl', [
         .controller('NavCtrl', [
@@ -61,7 +68,8 @@
             return {
             return {
                 showNav: showNav,
                 showNav: showNav,
                 hideNav: hideNav,
                 hideNav: hideNav,
-                toggleNav: toggleNav
+                toggleNav: toggleNav,
+                hideIfShown: hideIfShown
             };
             };
         }]);
         }]);
 
 

@@ -21,7 +21,7 @@
     'use strict';
     'use strict';
 
 
     // references to injected services
     // references to injected services
-    var $log, fs, ts, qhs;
+    var $log, fs, ts, ns, qhs;
 
 
     // internal state
     // internal state
     var enabled = true,
     var enabled = true,
@@ -33,7 +33,7 @@
             viewGestures: []
             viewGestures: []
         };
         };
 
 
-    // TODO: we need to have the concept of view token here..
+    // TODO: do we still need to have the concept of view token here..?
     function getViewToken() {
     function getViewToken() {
         return 'NotYetAViewToken';
         return 'NotYetAViewToken';
     }
     }
@@ -121,7 +121,7 @@
 
 
     // returns true if we 'consumed' the ESC keypress, false otherwise
     // returns true if we 'consumed' the ESC keypress, false otherwise
     function escapeKey(view, key, code, ev) {
     function escapeKey(view, key, code, ev) {
-        return qhs.hideQuickHelp();
+        return ns.hideIfShown() || qhs.hideQuickHelp();
     }
     }
 
 
     function toggleTheme(view, key, code, ev) {
     function toggleTheme(view, key, code, ev) {
@@ -168,12 +168,13 @@
 
 
     angular.module('onosUtil')
     angular.module('onosUtil')
     .factory('KeyService',
     .factory('KeyService',
-        ['$log', 'FnService', 'ThemeService',
+        ['$log', 'FnService', 'ThemeService', 'NavService',
 
 
-        function (_$log_, _fs_, _ts_) {
+        function (_$log_, _fs_, _ts_, _ns_) {
             $log = _$log_;
             $log = _$log_;
             fs = _fs_;
             fs = _fs_;
             ts = _ts_;
             ts = _ts_;
+            ns = _ns_;
 
 
             return {
             return {
                 bindQhs: function (_qhs_) {
                 bindQhs: function (_qhs_) {

+/*
+ * Copyright 2014,2015 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ ONOS GUI -- Util -- Theme Service - Unit Tests
+ */
+describe('factory: fw/nav/nav.js', function() {
+    var ns, $log, fs;
+    var d3Elem;
+
+    beforeEach(module('onosNav', 'onosUtil'));
+
+    beforeEach(inject(function (NavService, _$log_, FnService) {
+        ns = NavService;
+        $log = _$log_;
+        fs = FnService;
+        d3Elem = d3.select('body').append('div').attr('id', 'nav');
+        ns.hideNav();
+    }));
+
+    afterEach(function () {
+        d3.select('#nav').remove();
+    });
+
+    it('should define NavService', function () {
+        expect(ns).toBeDefined();
+    });
+
+    it('should define api functions', function () {
+        expect(fs.areFunctions(ns, [
+            'showNav', 'hideNav', 'toggleNav', 'hideIfShown'
+        ])).toBeTruthy();
+    });
+
+    function checkHidden(b) {
+        var what = b ? 'hidden' : 'visible';
+        expect(d3.select('#nav').style('visibility')).toEqual(what);
+    }
+
+    it('should start hidden', function () {
+        checkHidden(true);
+    });
+
+    it('should be shown then hidden', function () {
+        ns.showNav();
+        checkHidden(false);
+        ns.hideNav();
+        checkHidden(true);
+    });
+
+    it('should toggle hidden', function () {
+        ns.toggleNav();
+        checkHidden(false);
+        ns.toggleNav();
+        checkHidden(true);
+    });
+
+    it('should show idempotently', function () {
+        checkHidden(true);
+        ns.showNav();
+        checkHidden(false);
+        ns.showNav();
+        checkHidden(false);
+    });
+
+    it('should hide idempotently', function () {
+        checkHidden(true);
+        ns.hideNav();
+        checkHidden(true);
+    });
+
+    it('should be a noop if already hidden', function () {
+        checkHidden(true);
+        expect(ns.hideIfShown()).toBe(false);
+        checkHidden(true);
+    });
+
+    it('should hide if shown', function () {
+        ns.showNav();
+        checkHidden(false);
+        expect(ns.hideIfShown()).toBe(true);
+        checkHidden(true);
+    });
+
+});

@@ -22,7 +22,7 @@ describe('factory: fw/util/keys.js', function() {
         d3Elem, elem, last;
         d3Elem, elem, last;
   
   
 
 
-    beforeEach(module('onosUtil', 'onosSvg', 'onosLayer'));
+    beforeEach(module('onosUtil', 'onosSvg', 'onosLayer', 'onosNav'));
 
 
     beforeEach(inject(function (_$log_, KeyService, FnService, QuickHelpService) {
     beforeEach(inject(function (_$log_, KeyService, FnService, QuickHelpService) {
         $log = _$log_;
         $log = _$log_;

@@ -38,7 +38,8 @@ describe('Controller: OvDeviceCtrl', function () {
     };
     };
 
 
     // instantiate the Device module
     // instantiate the Device module
-    beforeEach(module('ovDevice', 'onosRemote', 'onosLayer', 'onosSvg', 'ngRoute'));
+    beforeEach(module('ovDevice', 'onosRemote', 'onosLayer', 'onosSvg',
+                      'onosNav', 'ngRoute'));
 
 
     beforeEach(inject(function(_$log_, $rootScope, _$controller_, $httpBackend) {
     beforeEach(inject(function(_$log_, $rootScope, _$controller_, $httpBackend) {
         $log = _$log_;
         $log = _$log_;

@@ -20,7 +20,7 @@
 describe('factory: view/topo/topoEvent.js', function() {
 describe('factory: view/topo/topoEvent.js', function() {
     var $log, fs, tes;
     var $log, fs, tes;
 
 
-    beforeEach(module('ovTopo', 'onosUtil', 'onosLayer', 'ngRoute'));
+    beforeEach(module('ovTopo', 'onosNav', 'onosUtil', 'onosLayer', 'ngRoute'));
 
 
     beforeEach(inject(function (_$log_, FnService, TopoEventService) {
     beforeEach(inject(function (_$log_, FnService, TopoEventService) {
         $log = _$log_;
         $log = _$log_;