GUI -- Navigation Pane canceled with Escape key.
- Also, fixed color of drop shadow on .dark navigation pane.
Change-Id: I43fa58923158ad3f637e9f8c3dbd50043e89176e
diff --git a/web/gui/src/main/webapp/app/fw/nav/nav.css b/web/gui/src/main/webapp/app/fw/nav/nav.css
index 8bdb32e..381b4f9 100644
--- a/web/gui/src/main/webapp/app/fw/nav/nav.css
+++ b/web/gui/src/main/webapp/app/fw/nav/nav.css
@@ -34,7 +34,7 @@
}
.dark #nav {
background-color: #444;
- box-shadow: 0 2px 8px #555;
+ box-shadow: 0 2px 8px #111;
}
#nav a {
diff --git a/web/gui/src/main/webapp/app/fw/nav/nav.js b/web/gui/src/main/webapp/app/fw/nav/nav.js
index aaa431d..ad85d90 100644
--- a/web/gui/src/main/webapp/app/fw/nav/nav.js
+++ b/web/gui/src/main/webapp/app/fw/nav/nav.js
@@ -44,6 +44,13 @@
navShown = !navShown;
updatePane();
}
+ function hideIfShown() {
+ if (navShown) {
+ hideNav();
+ return true;
+ }
+ return false;
+ }
angular.module('onosNav', [])
.controller('NavCtrl', [
@@ -61,7 +68,8 @@
return {
showNav: showNav,
hideNav: hideNav,
- toggleNav: toggleNav
+ toggleNav: toggleNav,
+ hideIfShown: hideIfShown
};
}]);
diff --git a/web/gui/src/main/webapp/app/fw/util/keys.js b/web/gui/src/main/webapp/app/fw/util/keys.js
index 1cdb044..d22a335 100644
--- a/web/gui/src/main/webapp/app/fw/util/keys.js
+++ b/web/gui/src/main/webapp/app/fw/util/keys.js
@@ -21,7 +21,7 @@
'use strict';
// references to injected services
- var $log, fs, ts, qhs;
+ var $log, fs, ts, ns, qhs;
// internal state
var enabled = true,
@@ -33,7 +33,7 @@
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() {
return 'NotYetAViewToken';
}
@@ -121,7 +121,7 @@
// returns true if we 'consumed' the ESC keypress, false otherwise
function escapeKey(view, key, code, ev) {
- return qhs.hideQuickHelp();
+ return ns.hideIfShown() || qhs.hideQuickHelp();
}
function toggleTheme(view, key, code, ev) {
@@ -168,12 +168,13 @@
angular.module('onosUtil')
.factory('KeyService',
- ['$log', 'FnService', 'ThemeService',
+ ['$log', 'FnService', 'ThemeService', 'NavService',
- function (_$log_, _fs_, _ts_) {
+ function (_$log_, _fs_, _ts_, _ns_) {
$log = _$log_;
fs = _fs_;
ts = _ts_;
+ ns = _ns_;
return {
bindQhs: function (_qhs_) {
diff --git a/web/gui/src/main/webapp/tests/app/fw/nav/nav-spec.js b/web/gui/src/main/webapp/tests/app/fw/nav/nav-spec.js
new file mode 100644
index 0000000..34281ef
--- /dev/null
+++ b/web/gui/src/main/webapp/tests/app/fw/nav/nav-spec.js
@@ -0,0 +1,98 @@
+/*
+ * 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);
+ });
+
+});
diff --git a/web/gui/src/main/webapp/tests/app/fw/util/keys-spec.js b/web/gui/src/main/webapp/tests/app/fw/util/keys-spec.js
index b453964..7f01aae 100644
--- a/web/gui/src/main/webapp/tests/app/fw/util/keys-spec.js
+++ b/web/gui/src/main/webapp/tests/app/fw/util/keys-spec.js
@@ -22,7 +22,7 @@
d3Elem, elem, last;
- beforeEach(module('onosUtil', 'onosSvg', 'onosLayer'));
+ beforeEach(module('onosUtil', 'onosSvg', 'onosLayer', 'onosNav'));
beforeEach(inject(function (_$log_, KeyService, FnService, QuickHelpService) {
$log = _$log_;
diff --git a/web/gui/src/main/webapp/tests/app/view/device/device-spec.js b/web/gui/src/main/webapp/tests/app/view/device/device-spec.js
index 462d70c..7ba9a27 100644
--- a/web/gui/src/main/webapp/tests/app/view/device/device-spec.js
+++ b/web/gui/src/main/webapp/tests/app/view/device/device-spec.js
@@ -38,7 +38,8 @@
};
// 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) {
$log = _$log_;
diff --git a/web/gui/src/main/webapp/tests/app/view/topo/topoEvent-spec.js b/web/gui/src/main/webapp/tests/app/view/topo/topoEvent-spec.js
index 32fa0e7..b121ac2 100644
--- a/web/gui/src/main/webapp/tests/app/view/topo/topoEvent-spec.js
+++ b/web/gui/src/main/webapp/tests/app/view/topo/topoEvent-spec.js
@@ -20,7 +20,7 @@
describe('factory: view/topo/topoEvent.js', function() {
var $log, fs, tes;
- beforeEach(module('ovTopo', 'onosUtil', 'onosLayer', 'ngRoute'));
+ beforeEach(module('ovTopo', 'onosNav', 'onosUtil', 'onosLayer', 'ngRoute'));
beforeEach(inject(function (_$log_, FnService, TopoEventService) {
$log = _$log_;