commit | 404f6b21c2805b395e6657aad9018b55ea3e8378 | [log] [tgz] |
---|---|---|
author | Simon Hunt <simon@onlab.us> | Wed Jan 21 14:00:56 2015 -0800 |
committer | Gerrit Code Review <gerrit@onlab.us> | Wed Jan 21 22:18:04 2015 +0000 |
tree | 556ce3e1ceb63d3d861e538e9e2bfe96f21e8d64 | |
parent | b9a8a18734a41ddc8a49abe18aaf092e7622462d [diff] [blame] |
GUI -- Removed dependence on jQuery -- it turns out that angular implements extend(). Change-Id: I0cca98975873aa6fa1bf8258a2bedbc508d3c7d7
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 d163292..81d0bc3 100644 --- a/web/gui/src/main/webapp/app/fw/util/keys.js +++ b/web/gui/src/main/webapp/app/fw/util/keys.js
@@ -92,7 +92,7 @@ } function setupGlobalKeys() { - $.extend(keyHandler, { + angular.extend(keyHandler, { globalKeys: { backSlash: [quickHelp, 'Show / hide Quick Help'], slash: [quickHelp, 'Show / hide Quick Help'],