QutEcoacoustics · atruskie · Sep 13, 2016 · Nov 4, 2015 · Feb 12, 2016 · Feb 12, 2016
diff --git a/.gitignore b/.gitignore
@@ -42,26 +42,6 @@ doc/
 # rubymine stuff
 /.idea
 
-
-# media folder
-/media/original/*
-/media/cachedimages/*
-/media/cachedaudio/*
-/media/experiments/*
-=======
-lib-cov
-*.seed
-*.log
-*.csv
-*.dat
-*.out
-*.pid
-*.gz
-
-pids
-logs
-results
-
 npm-debug.log
 node_modules/
 build/

diff --git a/.jshintrc b/.jshintrc
@@ -43,8 +43,8 @@
     "boss"          : false,     // true: Tolerate assignments where comparisons would be expected
     "debug"         : false,     // true: Allow debugger statements e.g. browser breakpoints.
     "eqnull"        : true,      // true: Tolerate use of `== null`
-    "esnext"        : true,      // true: Allow ES.next (ES6) syntax (ex: `const`)
-    "moz"           : false,     // true: Allow Mozilla specific syntax (extends and overrides esnext features)
+    "esversion"     : 6,         // {int} Specify the ECMAScript version to which the code must adhere.
+    "moz"           : true,     // true: Allow Mozilla specific syntax (extends and overrides esnext features)
                                  // (ex: `for each`, multiple try/catch, function expression…)
     "evil"          : false,     // true: Tolerate use of `eval` and `new Function()`
     "expr"          : false,     // true: Tolerate `ExpressionStatement` as Programs

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -6,13 +6,13 @@ module.exports = function (grunt) {
         path = require("path"),
         slash = require("slash"),
         _ = require("lodash"),
-        sass = require("./node_modules/node-sass");
+        sass = require("node-sass");
 
-    var _invalidateRequireCacheForFile = function(filePath){
+    var _invalidateRequireCacheForFile = function (filePath) {
         delete require.cache[path.resolve(filePath)];
     };
 
-    var requireNoCache =  function(filePath){
+    var requireNoCache = function (filePath) {
         _invalidateRequireCacheForFile(filePath);
         return require(filePath);
     };
@@ -38,6 +38,7 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks("grunt-ng-constant");
     grunt.loadNpmTasks("grunt-editor");
     grunt.loadNpmTasks("grunt-beep");
+    grunt.loadNpmTasks("grunt-newer");
 
     /**
      * Load in our build configuration file.
@@ -49,7 +50,8 @@ module.exports = function (grunt) {
      */
     var processVendorJs =
         require("./buildConfig/vendorTemplateProcessing.js")
-        (grunt, "./buildConfig/vendor.wrapper", "window.bawApp.externalsCallback", userConfig.vendor_files.jsWrapWithModule);
+        (grunt, "./buildConfig/vendor.wrapper", "window.bawApp.externalsCallback",
+            userConfig.vendor_files.jsWrapWithModule);
 
 
     /**
@@ -160,8 +162,8 @@ module.exports = function (grunt) {
                 writerOpts: {
                     // conventional-changelog-writer options go here
                     // adapted from https://github.com/ajoslin/conventional-changelog/blob/master/presets/angular.js
-                    transform: function(commit) {
-                        var ignored =["chore", "style", "refactor", "test"];
+                    transform: function (commit) {
+                        var ignored = ["chore", "style", "refactor", "test"];
 
                         if (commit.type === "feat") {
                             commit.type = "Features";
@@ -212,7 +214,7 @@ module.exports = function (grunt) {
                             commit.subject = commit.subject.substring(0, 80);
                         }
 
-                        _.map(commit.notes, function(note) {
+                        _.map(commit.notes, function (note) {
                             if (note.title === "BREAKING CHANGE") {
                                 note.title = "BREAKING CHANGES";
                             }
@@ -239,7 +241,7 @@ module.exports = function (grunt) {
                     "bower.json"
                 ],
                 updateConfigs: [
-                  "pkg"
+                    "pkg"
                 ],
                 commit: true,
                 commitMessage: "chore(release): v%VERSION%",
@@ -305,7 +307,7 @@ module.exports = function (grunt) {
                         "conf.environment": appEnvironment
                     };
 
-                    Object.keys(constantsFiles).forEach(function(key) {
+                    Object.keys(constantsFiles).forEach(function (key) {
                         var constantsModule = requireNoCache(constantsFiles[key]);
 
                         result[key] = constantsModule(appEnvironment);
@@ -373,8 +375,7 @@ module.exports = function (grunt) {
                 })()
             },
             build_appjs: {
-                options: {
-                },
+                options: {},
                 files: [
                     {
                         src: ["<%= app_files.js %>", "**/!(*.spec).js.map"],
@@ -416,7 +417,9 @@ module.exports = function (grunt) {
         babel: {
             options: {
                 sourceMap: true,
-                optional: ["es7.comprehensions"]
+                retainLines: true,
+
+                presets: "es2015"
             },
             transpile_appjs: {
                 files: [
@@ -466,7 +469,7 @@ module.exports = function (grunt) {
                         });
                     }()),
                     "buildConfig/module.prefix",
-//                    "<%= build_dir %>/src/**/*generated.js",
+                    //                    "<%= build_dir %>/src/**/*generated.js",
                     "<%= build_dir %>/src/**/*.js",
                     "<%= html2js.app.dest %>",
                     "<%= html2js.common.dest %>",
@@ -530,8 +533,8 @@ module.exports = function (grunt) {
             build: {
                 options: {
                     outputStyle: "expanded",
-                    sourceComments: "normal" /*'map',
-                     sourceMap: '<%= sassDestName %>.map'*/
+                    sourceComments: "normal",
+                    //sourceMap: true // currently broken :-(, refers to the wrong partials
                 },
                 src: "<%= app_files.processedSass %>",
                 dest: "<%= sassDest %>"
@@ -556,15 +559,24 @@ module.exports = function (grunt) {
          */
         jshint: {
             options: {
-                jshintrc: ".jshintrc"
+                jshintrc: ".jshintrc",
+                reporter: require("jshint-stylish")
+            },
+            src: {
+                //files: {
+                    src: [
+                        "<%= app_files.js %>",
+                        "!src/**/*.generated.js"
+                    ]
+               //}
+            },
+            test: {
+               // files: {
+                    src: [
+                        "<%= app_files.jsunit %>"
+                    ]
+               // }
             },
-            src: [
-                "<%= app_files.js %>",
-                "!src/**/*.generated.js"
-            ],
-            test: [
-                "<%= app_files.jsunit %>"
-            ],
             gruntfile: [
                 "Gruntfile.js"
             ]
@@ -683,22 +695,26 @@ module.exports = function (grunt) {
                 options: {
                     hostname: "*",
                     port: 8080,
-                    base: "./<%= build_dir %>",
-                    //debug: true,
+                    base: [
+                        "./"
+                    ],
+                    debug: false,
                     livereload: true,
                     middleware: function (connect, options) {
+                        var buildDirectory = grunt.config("build_dir");
+                        grunt.log.writeln("Base webserver directory: " + options.base);
+                        grunt.log.writeln("Build webserver directory: " + buildDirectory);
 
-                        grunt.log.writeln(options.base);
 
                         return [
                             modRewrite([
 
                                 // for source maps
-                                "^/assets/styles/vendor(.*) /vendor$1 [L]",
-                                "^/assets/styles/src(.*) /src$1 [L]",
+                                //"^/assets/styles/vendor(.*) /vendor$1 [L]",
+                                //"^/assets/styles/src(.*) /src$1 [L]",
 
                                 // this rule should match anything under assets and basically not rewrite it
-                                "^/assets(.*) /assets$1 [L]",
+                                //"^/assets(.*) /" + buildDirectory + "/assets$1 [L]",
 
 
                                 // this rule matches anything without an extension
@@ -711,7 +727,13 @@ module.exports = function (grunt) {
                                 // with or without a querystring
                                 // if matched, the root (index.html) is sent back instead.
                                 // from there, angular deals with the route information
-                                "!(\\/[^\\.\\/\\?]+\\.\\w+) / [L]"
+                                //"!(\\/[^\\.\\/\\?]+\\.\\w+) /" + buildDirectory + "/ [L]"
+
+                                // does not match any url startng with /build, /src, or /vendor
+                                // if matched, the root (index.html) is sent back instead.
+                                // from there, angular deals with the route information
+                                "!(^(\\/build|\\/src|\\/vendor)) /" + buildDirectory + "/ [L]"
+
                             ]),
 
                             // disable all caching
@@ -724,15 +746,29 @@ module.exports = function (grunt) {
                             // will be served from.
                             //connect.static(options.base[0]),
                             gzipStatic(options.base[0])
-
-                            // for source maps
-                            //connect.static(__dirname)
                         ];
                     }
                 }
             }
         },
 
+        /**
+         * The grunt newer task allows us to only send modified files
+         * to tasks. This task typically needs no configuration.
+         * The configuration below is to to do a performance comparison
+         * (with/without the task).
+         * The `newer` task send a live reload (after a JS source change) in
+         * ~5 seconds. With the task disabled it takes about ~40 seconds to
+         * process all files.
+         */
+        // newer: {
+        //     options: {
+        //         override: function(detail, include) {
+        //             include(true);
+        //         }
+        //     }
+        // },
+
         /**
          * And for rapid development, we have a watch set up that checks to see if
          * any of the files listed below change, and then to execute the listed
@@ -753,7 +789,7 @@ module.exports = function (grunt) {
             options: {
                 livereload: true,
                 livereloadOnError: false,
-                spawn: false
+                //spawn: true
             },
 
             /**
@@ -778,15 +814,15 @@ module.exports = function (grunt) {
                     "<%= app_files.js %>"
                 ],
                 // recent modification: files are copied before unit tests are run!
-                tasks: ["jshint:src", "beep:error", "ngconstant:build", "babel:transpile_appjs", "copy:build_appjs", "karma:unit:run"]
+                tasks: ["newer:jshint:src", "beep:error", "ngconstant:build", "newer:babel:transpile_appjs", "copy:build_appjs", "newer:karma:unit:run"]
             },
 
             jssrc2: {
                 files: [
-                    "<%= app_files.specialjs %>",
+                    "<%= app_files.specialjs %>"
                 ],
                 // recent modification: files are copied before unit tests are run!
-                tasks: ["jshint:src", "beep:error","ngconstant:build", "babel:transpile_appjs", "copy:build_appjs", "karma:unit:run"]
+                tasks: ["jshint:src", "beep:error", "ngconstant:build", "babel:transpile_appjs", "copy:build_appjs", "karma:unit:run"]
             },
 
 
@@ -836,7 +872,7 @@ module.exports = function (grunt) {
                 files: [
                     "<%= app_files.jsunit %>"
                 ],
-                tasks: ["babel:transpile_appjs", "jshint:test", "karma:unit:run"],
+                tasks: ["newer:babel:transpile_appjs", "newer:jshint:test", "karma:unit:run"],
                 options: {
                     livereload: false
                 }
@@ -884,7 +920,7 @@ module.exports = function (grunt) {
         "index:compile"
     ]);
 
-    grunt.registerTask("release", "bump, changelog, commit, and publish to Github", function(type) {
+    grunt.registerTask("release", "bump, changelog, commit, and publish to Github", function (type) {
 
         if (!type) {
             grunt.fatal(new Error("release task must have a type supplied"));

diff --git a/bower.json b/bower.json
@@ -2,36 +2,41 @@
   "name": "baw-client",
   "version": "0.19.2",
   "devDependencies": {
-    "angular": "1.3.x",
-    "angular-bootstrap": "~0.12.0",
+    "angular": "1.5.x",
+    "angular-bootstrap": "1.1.x",
     "angular-growl-v2": "~0.7.0",
-    "angular-local-storage": "~0.1.x",
-    "angular-mocks": "~1.3.x",
-    "angular-resource": "~1.3.x",
-    "angular-route": "~1.3.x",
-    "angular-sanitize": "~1.3.x",
+    "angular-local-storage": "~0.2.x",
+    "angular-mocks": "~1.5.x",
+    "angular-resource": "~1.5.x",
+    "angular-route": "~1.5.x",
+    "angular-sanitize": "~1.5.x",
     "angular-tags": "git://github.com/boneskull/angular-tags.git#master",
     "angular-ui-utils": "latest",
-    "bowser": "0.7.x",
+    "bowser": "1.0.x",
     "d3": "~3.5.x",
-    "draggabilly": "~1.1.x",
+    "draggabilly": "2.x",
     "hint.css": "https://github.com/chinchang/hint.css.git",
     "humanize-duration": "^3.4",
-    "jasmine-expect": "1.x",
+    "jasmine-expect": "2.x",
     "jquery-ui": "~1.11.x",
     "lodash": "4.0",
     "momentjs": "^2.10",
     "objectdiff": "https://github.com/NV/objectDiff.js.git",
     "round-date": "^1.1",
-    "sass-bootstrap": "3.0.2",
-    "angular-loading-bar": "~0.7.1",
-    "ng-form-group": "~1.2.11",
-    "bootstrap-sass": "3.3-stable"
+    "angular-loading-bar": "~0.8.x",
+    "ng-form-group": "^1.3.3",
+    "bootstrap-sass": "3.3-stable",
+    "font-awesome": "^4.5.0",
+    "filesize": "^3.2.1",
+    "angular-ui-ace": "bower",
+    "angular-messages": "^1.5.0",
+    "c3": "git://github.com/masayuki0812/c3.git#98769492d07b6103bfc30a0254ccb1e1ec1cca50"
   },
   "dependencies": {},
   "private": true,
   "resolutions": {
-    "angular": "1.3.x",
-    "get-size": "~2.0.2"
+    "angular": "1.5.x",
+    "get-size": "~2.0.2",
+    "font-awesome": "^4.5.0"
   }
 }