GUI -- reworking code to eliminate unnecessary 'ONOS' global.
- re-package fn and keys factories into util module.
Change-Id: I3d9f50b9a91468140845e862aff3fdb518948774
diff --git a/web/gui/src/main/webapp/app/onos.js b/web/gui/src/main/webapp/app/onos.js
index db104dd..1fece59 100644
--- a/web/gui/src/main/webapp/app/onos.js
+++ b/web/gui/src/main/webapp/app/onos.js
@@ -15,21 +15,25 @@
*/
/*
- ONOS GUI -- Base Framework
+ ONOS GUI -- Main Application Module
@author Simon Hunt
*/
-// our one global variable
-var ONOS;
-
(function () {
'use strict';
- ONOS = angular.module('onosApp', ['onosMast'])
- .controller('OnosCtrl', ['KeyService', function (ks) {
- console.log('OnosCtrl has been created');
+ angular.module('onosApp', ['onosUtil', 'onosMast'])
+ .controller('OnosCtrl', ['$log', 'KeyService', function (_$log_, ks) {
+ var $log = _$log_,
+ self = this;
+
+ self.version = '1.1.0';
+
+ // initialize onos (main app) controller here...
ks.installOn(d3.select('body'));
+
+ $log.log('OnosCtrl has been created');
}]);
}());