Fixed build, fixed JSHint warning

QutEcoacoustics · Aug 24, 2014 · 4fa21d5 · 4fa21d5
1 parent 2b06646
commit 4fa21d5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/bower.json b/bower.json
@@ -22,8 +22,5 @@
     "draggabilly": "~1.1.x"
   },
   "dependencies": {},
-  "resolutions": {
-    "angular": ">1.2.6"
-  },
   "private": true
 }
diff --git a/karma/karma-unit.tpl.js b/karma/karma-unit.tpl.js
@@ -19,7 +19,7 @@ module.exports = function (config) {
      */
     configObject.files = [
         "vendor/objectdiff/objectDiff.js",
-        "vendor/jasmine-matchers/dist/jasmine-matchers.js"
+        "vendor/jasmine-expect/dist/jasmine-matchers.js"
     ].concat(JSON.parse(fileJson).concat([
             'src/**/*.js',
             'src/**/*.spec.js'

diff --git a/src/components/services/services.js b/src/components/services/services.js
@@ -540,14 +540,14 @@
                         data = data || {};
 
                         throw "add object camel casing here";
-                        //railsFieldRenamingInterceptor().core(data);
+                        /*railsFieldRenamingInterceptor().core(data);
 
                         if (data.response === "ok") {
                             Authenticator.loginSuccess(data);
                         }
                         else {
                             Authenticator.loginFailure(data);
-                        }
+                        }*/
                     });
                 }