commit 404f6b21c2805b395e6657aad9018b55ea3e8378
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

GUI -- Removed dependence on jQuery -- it turns out that angular implements extend().

Change-Id: I0cca98975873aa6fa1bf8258a2bedbc508d3c7d7

web/gui/src/main/webapp/app/fw/util/fn.js

diff --git a/web/gui/src/main/webapp/app/fw/util/fn.js b/web/gui/src/main/webapp/app/fw/util/fn.js
index cf9e737..10cb6ff 100644
--- a/web/gui/src/main/webapp/app/fw/util/fn.js
+++ b/web/gui/src/main/webapp/app/fw/util/fn.js
@@ -21,11 +21,12 @@
     'use strict';
 
     function isF(f) {
-        return $.isFunction(f) ? f : null;
+        return typeof f === 'function' ? f : null;
     }
 
     function isA(a) {
-        return $.isArray(a) ? a : null;
+        // NOTE: Array.isArray() is part of EMCAScript 5.1
+        return Array.isArray(a) ? a : null;
     }
 
     function isS(s) {
@@ -33,7 +34,7 @@
     }
 
     function isO(o) {
-        return $.isPlainObject(o) ? o : null;
+        return (o && typeof o === 'object' && o.constructor === Object) ? o : null;
     }
 
     function contains(a, x) {

web/gui/src/main/webapp/app/fw/util/keys.js

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'],