Integrated latest master. Started redesigning architecture.

Also included static files that will be used to simulate indices.
QutEcoacoustics · Nov 3, 2014 · a659dde · a659dde
1 parent c978677
commit a659dde
Show file tree

Hide file tree

Showing 28 changed files with 471 additions and 322 deletions.
diff --git a/buildConfig/build.config.js b/buildConfig/build.config.js
@@ -69,9 +69,9 @@ module.exports = {
      */
     vendor_files: {
         jsWrapWithModule: [
+            'vendor/d3/d3.js',
             'vendor/momentjs/moment.js',
             'vendor/lodash/dist/lodash.js',
-
             'vendor/bowser/bowser.js',
             'vendor/humanize-duration/humanize-duration.js'
         ],

diff --git a/src/app/d3Bindings/audioView/audioView.js b/src/app/d3Bindings/audioView/audioView.js
@@ -10,8 +10,7 @@ angular.module("bawApp.d3.audioView", ["bawApp.d3"])
 
         var parseFormat = d3.time.format("%Y-%m-%dT%H:%M:%S%Z"),
             keyYearFormat = d3.time.format("%Y"),
-            keyMonthFormat = d3.time.format("%m")
-            ;
+            keyMonthFormat = d3.time.format("%m");
 
         var updateData = function updateData(json) {
             // change data so it is nested properly
@@ -38,7 +37,7 @@ angular.module("bawApp.d3.audioView", ["bawApp.d3"])
             // add month divs
             var monthData = yearsData
                 .selectAll("div")
-                .data(function(year){ return year.values });
+                .data(function(year){ return year.values; });
 
             monthData
                 .enter()
@@ -86,7 +85,7 @@ angular.module("bawApp.d3.audioView", ["bawApp.d3"])
                     return $scope.data;
                 }, function (newValue, oldValue) {
                     if (newValue) {
-                        updateData(newValue.data);
+                        updateData(newValue);
                     }
                 });
 

diff --git a/src/app/d3Bindings/bawD3.js b/src/app/d3Bindings/bawD3.js