| commit | 71892221d15952691e07088eababc8cab0364073 | [log] [tgz] |
|---|---|---|
| author | Simon Hunt <simon@onlab.us> | Tue Sep 29 13:39:40 2015 -0700 |
| committer | Gerrit Code Review <gerrit@onlab.us> | Tue Sep 29 20:59:49 2015 +0000 |
| tree | 3a40520da8c72a682b292016c1c3caa9ac544c90 | |
| parent | b4916d05035b77c3c90750f057c312f042fc1f91 [diff] [blame] |
ONOS-2901 - Added fix to ignore reserved global keys, when activating a topo overlay. Change-Id: I9bcd15e4a5e6d688683e0ac703328dc4f840c461
diff --git a/web/gui/src/main/webapp/app/view/topo/topo.js b/web/gui/src/main/webapp/app/view/topo/topo.js index 2189410..42b6f4b 100644 --- a/web/gui/src/main/webapp/app/view/topo/topo.js +++ b/web/gui/src/main/webapp/app/view/topo/topo.js
@@ -95,6 +95,9 @@ // and include them in the quick-help panel function mergeKeys(extra) { var _hf = actionMap._helpFormat[2]; + + ks.checkNotGlobal(extra); + extra._keyOrder.forEach(function (k) { var d = extra[k], cb = d && d.cb,