From b574a1fd83a523e71f304105be363bee111ed6c5 Mon Sep 17 00:00:00 2001
From: Patrick McDonagh <pmcdonagh@henry-pump.com>
Date: Tue, 3 May 2016 16:06:00 -0500
Subject: [PATCH] Moved d3 to being a dependency

---
 www/.tmp/public/js/ng/controller_config.js               | 2 +-
 www/{.tmp/public/js => assets/js/dependencies}/d3.min.js | 0
 www/tasks/pipeline.js                                    | 1 -
 www/views/layout.ejs                                     | 2 +-
 4 files changed, 2 insertions(+), 3 deletions(-)
 rename www/{.tmp/public/js => assets/js/dependencies}/d3.min.js (100%)

diff --git a/www/.tmp/public/js/ng/controller_config.js b/www/.tmp/public/js/ng/controller_config.js
index 5762724..a91179d 100644
--- a/www/.tmp/public/js/ng/controller_config.js
+++ b/www/.tmp/public/js/ng/controller_config.js
@@ -52,7 +52,7 @@ poconsole.controller('configCtrl', function($scope, Page, $log, config, devices)
         	$scope.loggerRunning = data.status;
         });
     };
-    // $scope.checkLogger();
+    $scope.checkLogger();
 
     $scope.restartLogger = function(){
         var restartLogger = config.restartLogger();
diff --git a/www/.tmp/public/js/d3.min.js b/www/assets/js/dependencies/d3.min.js
similarity index 100%
rename from www/.tmp/public/js/d3.min.js
rename to www/assets/js/dependencies/d3.min.js
diff --git a/www/tasks/pipeline.js b/www/tasks/pipeline.js
index ee73b88..bb652b1 100644
--- a/www/tasks/pipeline.js
+++ b/www/tasks/pipeline.js
@@ -42,7 +42,6 @@ var jsFilesToInject = [
   'js/dist/ng-quick-date.js',
   'js/justgage.js',
   'js/ng-justgage.js',
-  'js/d3.min.js',
   'js/LineChart.js',
   'js/dist/sails.io.js',
   'js/dist/angular-sails.js',
diff --git a/www/views/layout.ejs b/www/views/layout.ejs
index e593c79..59430fe 100644
--- a/www/views/layout.ejs
+++ b/www/views/layout.ejs
@@ -98,6 +98,7 @@
 
     <!--SCRIPTS-->
     <script src="/js/dependencies/sails.io.js"></script>
+    <script src="/js/dependencies/d3.min.js"></script>
     <script src="/js/dependencies/sugar.min.js"></script>
     <script src="/js/angular.js"></script>
     <script src="/js/angular-route.js"></script>
@@ -107,7 +108,6 @@
     <script src="/js/dist/ng-quick-date.js"></script>
     <script src="/js/justgage.js"></script>
     <script src="/js/ng-justgage.js"></script>
-    <script src="/js/d3.min.js"></script>
     <script src="/js/LineChart.js"></script>
     <script src="/js/dist/sails.io.js"></script>
     <script src="/js/dist/angular-sails.js"></script>