save point

QutEcoacoustics · Jun 7, 2015 · 3a59269 · 3a59269
1 parent 70c3865
commit 3a59269
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 25 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,31 +1,31 @@
 module.exports = function (grunt) {
 
-    var modRewrite = require('connect-modrewrite'),
-        gzipStatic = require('connect-gzip-static'),
-        path = require('path'),
+    var modRewrite = require("connect-modrewrite"),
+        gzipStatic = require("connect-gzip-static"),
+        path = require("path"),
         slash = require("slash"),
-        _ = require('lodash');
+        _ = require("lodash");
 
 
     /**
      * Load required Grunt tasks. These are installed based on the versions listed
      * in `package.json` when you do `npm install` in this directory.
      */
-    grunt.loadNpmTasks('grunt-contrib-clean');
-    grunt.loadNpmTasks('grunt-contrib-copy');
-    grunt.loadNpmTasks('grunt-contrib-jshint');
-    grunt.loadNpmTasks('grunt-contrib-concat');
-    grunt.loadNpmTasks('grunt-contrib-watch');
-    grunt.loadNpmTasks('grunt-contrib-uglify');
-    grunt.loadNpmTasks('grunt-conventional-changelog');
-    //grunt.loadNpmTasks('grunt-changelog');
-    grunt.loadNpmTasks('grunt-bump');
-    grunt.loadNpmTasks('grunt-sass');
-    grunt.loadNpmTasks('grunt-karma');
-    grunt.loadNpmTasks('grunt-ngmin');
-    grunt.loadNpmTasks('grunt-html2js');
-    grunt.loadNpmTasks('grunt-contrib-connect');
-
+    grunt.loadNpmTasks("grunt-contrib-clean");
+    grunt.loadNpmTasks("grunt-contrib-copy");
+    grunt.loadNpmTasks("grunt-contrib-jshint");
+    grunt.loadNpmTasks("grunt-contrib-concat");
+    grunt.loadNpmTasks("grunt-contrib-watch");
+    grunt.loadNpmTasks("grunt-contrib-uglify");
+    grunt.loadNpmTasks("grunt-conventional-changelog");
+    //grunt.loadNpmTasks("grunt-changelog");
+    grunt.loadNpmTasks("grunt-bump");
+    grunt.loadNpmTasks("grunt-sass");
+    grunt.loadNpmTasks("grunt-karma");
+    grunt.loadNpmTasks("grunt-ngmin");
+    grunt.loadNpmTasks("grunt-html2js");
+    grunt.loadNpmTasks("grunt-contrib-connect");
+    grunt.loadNpmTasks("grunt-babel");
 
     /**
      * Load in our build configuration file.
@@ -436,7 +436,9 @@ module.exports = function (grunt) {
              */
             app: {
                 options: {
-                    base: 'src/app'
+                    base: 'src/app',
+                    // produce only one module
+                    singleModule: true
                 },
                 src: ['<%= app_files.atpl %>'],
                 dest: '<%= build_dir %>/templates-app.js'

diff --git a/package.json b/package.json
@@ -12,13 +12,11 @@
     "type": "git",
     "url": "https://github.com/QutBioacoustics/baw-client.git"
   },
-  "//": [
-    "THE karma-chrome-launcher IS NEEDED TO LAUNCH CHROME PROPERLY ON WINDOWS. REMOVE WHEN PULL REQUEST COMPLETED https://github.com/karma-runner/karma-chrome-launcher"
-  ],
   "devDependencies": {
     "connect-gzip-static": "^1.0.0",
     "connect-modrewrite": "0.7.x",
     "grunt": "~0.4.1",
+    "grunt-babel": "^5.0.1",
     "grunt-bump": "^0.3",
     "grunt-changelog": "^0.3",
     "grunt-contrib-clean": "^0.6.0",

diff --git a/src/app/app.js b/src/app/app.js
@@ -205,7 +205,7 @@ var app = angular.module('baw',
                  // configure angular-growl
                  growlProvider.globalPosition('top-center');
 
-                 // configure local storage provider with our own namepspace
+                 // configure local storage provider with our own namespace
                  localStorageServiceProvider.setPrefix(constants.namespace);
 
                  // for compatibility with rails api

diff --git a/src/index.html b/src/index.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- TODO: add ng-strict-di attribute to html element. Currently blocked by batarang https://github.com/angular/angularjs-batarang/issues/138 -->
-<html ng-app="baw" ng-controller="AppCtrl">
+<html ng-app="baw" ng-controller="AppCtrl" ng-strict-di>
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">