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_) {