Simon Hunt
Committed by Gerrit Code Review

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

Change-Id: I0cca98975873aa6fa1bf8258a2bedbc508d3c7d7
......@@ -130,7 +130,7 @@
// converts given TopoJSON-format data into corresponding GeoJSON
// data, and creates a path generator for that data.
function createPathGenerator(topoData, opts) {
var settings = $.extend({}, defaultGenSettings, opts),
var settings = angular.extend({}, defaultGenSettings, opts),
topoObject = topoData.objects[settings.objectTag],
geoData = topojson.feature(topoData, topoObject),
proj = settings.projection,
......
......@@ -60,7 +60,7 @@
function createZoomer(opts) {
var cz = 'ZoomService.createZoomer(): ',
d3s = ' (D3 selection) property defined',
settings = $.extend({}, defaultSettings, opts),
settings = angular.extend({}, defaultSettings, opts),
zoom = d3.behavior.zoom()
.translate([0, 0])
.scale(1)
......
......@@ -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) {
......
......@@ -92,7 +92,7 @@
}
function setupGlobalKeys() {
$.extend(keyHandler, {
angular.extend(keyHandler, {
globalKeys: {
backSlash: [quickHelp, 'Show / hide Quick Help'],
slash: [quickHelp, 'Show / hide Quick Help'],
......
......@@ -27,7 +27,6 @@
<script src="../tp/d3.js"></script>
<script src="../tp/topojson.v1.min.js"></script>
<script src="../tp/jquery-2.1.1.min.js"></script>
<!-- ONOS UI Framework included here -->
<!-- TODO: use a single catenated-minified file here -->
......
......@@ -21,7 +21,6 @@ module.exports = function(config) {
'../tp/angular-route.js',
'../tp/d3.js',
'../tp/topojson.v1.min.js',
'../tp/jquery-2.1.1.min.js',
// production code...
// make sure modules are defined first...
......