More cleanup

interface/.jshintrc

@@ -18,6 +18,8 @@
   "trailing": true,
   "smarttabs": true,
   "globals": {
-    "angular": false
+    "angular": false,
+    "d3": false,
+    "_": false
   }
 }

interface/app/index.html

@@ -10,9 +10,10 @@
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width">
     <!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
+    <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" />
     <!-- build:css styles/vendor.css -->
     <!-- bower:css -->
-    <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" />
+    <link rel="stylesheet" href="bower_components/angular-motion/dist/angular-motion.css" />
     <link rel="stylesheet" href="bower_components/animate.css/animate.css" />
     <link rel="stylesheet" href="bower_components/font-awesome/css/font-awesome.css" />
     <!-- endbower -->

interface/app/scripts/app.js

@@ -29,10 +29,10 @@ angular.module('interfaceApp', [
       })
       .when('/login/:code', {
         template: '<div></div>',
-        controller: [ 'AuthService', function(AuthService) { AuthService.getToken(); }] 
+        controller: [ 'AuthService', function(AuthService) { AuthService.getToken(); }]
       })
       .when('/forbidden', {
-        template: "<h4 class='text-center'>You don't have permission to use this site.</h4>"
+        template: '<h4 class=\'text-center\'>You don\'t have permission to use this site.</h4>'
       })
       .otherwise({
         redirectTo: '/'

interface/app/scripts/controllers/entity.js

@@ -5,6 +5,6 @@ angular.module('interfaceApp')
 
       DataService.site = {
         'code': $routeParams.code
-      }
+      };
       DataService.getEntityNetwork($routeParams.entityId);
   }]);

interface/app/scripts/controllers/site.js

@@ -1,91 +1,91 @@
 'use strict';
 
 angular.module('interfaceApp')
-  .controller('SiteCtrl', [ '$rootScope', '$scope', '$routeParams', '$http', '$timeout', '$location', 'configuration', 'DataService', 
-    function($rootScope, $scope, $routeParams, $http, $timeout, $location, conf, DataService) {
+    .controller('SiteCtrl', ['$rootScope', '$scope', '$routeParams', '$http', '$timeout', '$location', 'configuration', 'DataService',
+        function ($rootScope, $scope, $routeParams, $http, $timeout, $location, conf, DataService) {
 
-        $scope.site = $routeParams.code; 
-        $scope.graph = $routeParams.explore;
-        $scope.service = conf[conf.service];
-        $scope.showEntityNetwork = false;
+            $scope.site = $routeParams.code;
+            $scope.graph = $routeParams.explore;
+            $scope.service = conf[conf.service];
+            $scope.showEntityNetwork = false;
 
-        $scope.initting = true;
-        $scope.progress = false;
-        $scope.datasetError = false;
-        $scope.ready = false;
-        $scope.loadGraph = false;
-        $scope.total = 0;
-        $scope.processed = 0;
-
-        var url = $scope.service + '/network/' + $scope.site + '/' + $scope.graph;
-        $http.get(url).then(function(d) {
-            // kick off the progress update in a moment; needs time to get going..
-            $timeout(function() { $scope.update(); }, 100);
-            $scope.progress = false;
-            $scope.site = {
-                'name': d.data.name,
-                'url': d.data.url,
-                'code': $scope.site
-            }
-            DataService.site = $scope.site;
-        },
-        function() {
-            $scope.datasetError = true;
+            $scope.initting = true;
             $scope.progress = false;
-            $scope.initting = false;
-        });
-
-        $scope.$on('graph-ready', function() {
-            $scope.showControls = true;
-        })
-        $scope.$on('load-entity-network-view', function() {
-            $scope.showEntityNetwork = true;
-        })
-        $scope.$on('destroy-entity-network-view', function() {
-            $scope.showEntityNetwork  = false;
-        })
-
-        // When the back button is pressed whilst viewing the entity network,
-        //  intercept the location change event, cancel it, and destroy the 
-        //  entity network
-        $scope.$on('$locationChangeStart', function(e, n, o) {
-            if (o.match(/^.*\/site\/.*\/byEntity$/) && $scope.showEntityNetwork === true) {
-                $scope.showEntityNetwork  = false;
-                e.preventDefault();
-            }
-        });
+            $scope.datasetError = false;
+            $scope.ready = false;
+            $scope.loadGraph = false;
+            $scope.total = 0;
+            $scope.processed = 0;
 
-        $scope.update = function() {
-            var url = $scope.service + '/network/' + $scope.site.code + '/' + $scope.graph + '/status';
-            $http.get(url).then(function(resp) {
-                if ((resp.data.processed !== null) && (resp.data.processed !== "")) {
-                    $scope.initting = false;
-                    $scope.progress = true;
-                    $scope.processed = resp.data.processed;
-                    $scope.total = resp.data.total;
-                    $timeout(function() { $scope.update(); }, 100);
-                } else {
+            var url = $scope.service + '/network/' + $scope.site + '/' + $scope.graph;
+            $http.get(url).then(function (d) {
+                // kick off the progress update in a moment; needs time to get going..
+                $timeout(function () { $scope.update(); }, 100);
+                $scope.progress = false;
+                $scope.site = {
+                    'name': d.data.name,
+                    'url': d.data.url,
+                    'code': $scope.site
+                };
+                DataService.site = $scope.site;
+            },
+                function () {
+                    $scope.datasetError = true;
                     $scope.progress = false;
                     $scope.initting = false;
-                    $scope.processData(resp.data);
+                });
+
+            $scope.$on('graph-ready', function () {
+                $scope.showControls = true;
+            });
+            $scope.$on('load-entity-network-view', function () {
+                $scope.showEntityNetwork = true;
+            });
+            $scope.$on('destroy-entity-network-view', function () {
+                $scope.showEntityNetwork = false;
+            });
+
+            // When the back button is pressed whilst viewing the entity network,
+            //  intercept the location change event, cancel it, and destroy the 
+            //  entity network
+            $scope.$on('$locationChangeStart', function (e, n, o) {
+                if (o.match(/^.*\/site\/.*\/byEntity$/) && $scope.showEntityNetwork === true) {
+                    $scope.showEntityNetwork = false;
+                    e.preventDefault();
                 }
-            },
-            function(){
-                $scope.progress = false;
             });
-        };
 
-        $scope.processData = function(d) {
-            DataService.init();
-            $scope.data = DataService.processSiteData(d);
+            $scope.update = function () {
+                var url = $scope.service + '/network/' + $scope.site.code + '/' + $scope.graph + '/status';
+                $http.get(url).then(function (resp) {
+                    if ((resp.data.processed !== null) && (resp.data.processed !== '')) {
+                        $scope.initting = false;
+                        $scope.progress = true;
+                        $scope.processed = resp.data.processed;
+                        $scope.total = resp.data.total;
+                        $timeout(function () { $scope.update(); }, 100);
+                    } else {
+                        $scope.progress = false;
+                        $scope.initting = false;
+                        $scope.processData(resp.data);
+                    }
+                },
+                    function () {
+                        $scope.progress = false;
+                    });
+            };
+
+            $scope.processData = function (d) {
+                DataService.init();
+                $scope.data = DataService.processSiteData(d);
+
+                // now get it all going
+                $scope.ready = true;
 
-            // now get it all going
-            $scope.ready = true;
-
-            $timeout(function(d) {
-                $scope.loadGraph = true;
-            }, 100);
-        }
+                $timeout(function () {
+                    $scope.loadGraph = true;
+                }, 100);
+            };
 
 
-  }]);
+        }]);

interface/app/scripts/directives/colour-picker.js

@@ -9,7 +9,7 @@ angular.module('interfaceApp')
           'data': '=',
       },
       controllerAs: 'colourPickerCtrl',
-      link: function postLink(scope, element, attrs) {
+      link: function postLink(scope) {
           scope.showPicker = false;
           scope.showChooser = false;
           scope.custom = {};
@@ -20,7 +20,7 @@ angular.module('interfaceApp')
           scope.$on('close-colour-picker', function() {
               scope.showPicker = false;
               scope.showChooser = false;
-          })
+          });
 
           // get the default colours from the configuration
           var process = function() {
@@ -32,7 +32,7 @@ angular.module('interfaceApp')
                     scope.types[k] = DataService.types[k];
                   }
               });
-          }
+          };
 
           scope.toggleColourPicker = function() {
               scope.showPicker = !scope.showPicker;
@@ -41,28 +41,28 @@ angular.module('interfaceApp')
                   $rootScope.$broadcast('close-type-filter');
                   process();
               }
-          }
+          };
 
           scope.changeColour = function(type) {
               scope.showPicker = false;
               scope.showChooser = true;
               scope.type = type;
-          }
+          };
           scope.setColor = function(color) {
               scope.types[scope.type].color = color;
               DataService.setColor(scope.type, color);
               scope.showPicker = true;
               scope.showChooser = false;
               $rootScope.$broadcast('colours-changed');
-          }
+          };
           scope.save = function() {
               scope.setColor(scope.custom.color);
               scope.dismissChooser();
-          }
+          };
           scope.dismissChooser = function() {
               scope.showPicker = true;
               scope.showChooser = false;
-          }
+          };
       }
     };
   }]);