chore(dependencies) Updated all dependencies

Updated bower and npm dependencies. Taking advantage of new imagePath feature in grunt-sass. Updated scss files to use the the appropriate image-url function. Updated to Jasmine 2.0. Fixed toThrow to toThrowError.
QutEcoacoustics · Jun 3, 2014 · f865922 · f865922
1 parent a98c185
commit f865922
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 25 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -359,6 +359,7 @@ module.exports = function (grunt) {
             },
             build: {
                 options: {
+                    imagePath: '<%= build_configs.current.siteDir %>assets/img',
                     outputStyle: 'expanded',
                     sourceComments: 'normal' /*'map',
                     sourceMap: '<%= sassDestName %>.map'*/
@@ -368,6 +369,7 @@ module.exports = function (grunt) {
             },
             compile: {
                 options: {
+                    imagePath: '<%= build_configs.current.siteDir %>assets/img',
                     outputStyle: 'compressed',
                     sourceComments: 'none'
                 },

diff --git a/bower.json b/bower.json
@@ -6,20 +6,20 @@
     "angular-mocks": "~1.2.x",
     "angular-route": "~1.2.x",
     "angular-resource": "~1.2.x",
-    "angular-bootstrap": "~0.6.0",
-    "angular-ui-router": "~0.0.1",
+    "angular-bootstrap": "~0.11.0",
+    "angular-ui-router": "~0.2.x",
     "angular-ui-utils": "latest",
-    "sass-bootstrap": "3.0.0",
+    "sass-bootstrap": "3.0.2",
     "hint.css": "https://github.com/chinchang/hint.css.git",
-    "modernizr": "~2.6.2",
+    "modernizr": "~2.8.x",
     "jquery-ui": "~1.10.3",
-    "momentjs": "~2.3.0",
-    "jasmine-matchers": "https://github.com/JamieMason/Jasmine-Matchers.git",
+    "momentjs": "~2.6.x",
+    "jasmine-matchers": "https://github.com/JamieMason/Jasmine-Matchers.git#develop",
     "objectdiff": "https://github.com/NV/objectDiff.js.git",
-    "lodash": "~2.3.0",
+    "lodash": "~2.4.x",
     "angular-tags": "git://github.com/boneskull/angular-tags.git#master",
     "angular-sanitize": "~1.2.x",
-    "draggabilly": "~1.0.9"
+    "draggabilly": "~1.1.x"
   },
   "dependencies": {},
   "resolutions": {

diff --git a/package.json b/package.json
@@ -20,23 +20,23 @@
     "grunt": "~0.4.1",
     "grunt-contrib-clean": "~0.5.0",
     "grunt-contrib-copy": "0.5.x",
-    "grunt-contrib-jshint": "0.8.x",
-    "grunt-contrib-concat": "~0.3.0",
-    "grunt-contrib-watch": "~0.5.3",
-    "grunt-contrib-uglify": "0.3.x",
+    "grunt-contrib-jshint": "0.10.x",
+    "grunt-contrib-concat": "~0.4.0",
+    "grunt-contrib-watch": "~0.6.x",
+    "grunt-contrib-uglify": "0.4.x",
     "grunt-karma": "~0.8.x",
     "karma-chrome-launcher": "~0.1.1",
     "grunt-ngmin": "0.0.3",
     "grunt-html2js": "~0.2.3",
-    "grunt-conventional-changelog": "~1.0",
-    "grunt-changelog": "~0.1",
-    "grunt-bump": "0.0.13",
-    "grunt-contrib-connect": "0.6.x",
+    "grunt-conventional-changelog": "~1.1",
+    "grunt-changelog": "~0.2.x",
+    "grunt-bump": "0.0.14",
+    "grunt-contrib-connect": "0.7.x",
     "connect-modrewrite": "~0.5.7",
-    "grunt-sass": "0.10.x",
+    "grunt-sass": "0.12.x",
     "lodash": "~2.4.1",
     "karma-phantomjs-launcher": "~0.1.1",
-    "karma-jasmine": "~0.1.5",
+    "karma-jasmine": "~0.2.x",
     "karma-firefox-launcher": "~0.1.3"
   },
   "private": true

diff --git a/src/app/annotationLibrary/_annotationLibrary.scss b/src/app/annotationLibrary/_annotationLibrary.scss
@@ -1,4 +1,5 @@
-$loadGifPath: $IMAGE_ASSET_PATH + 'assets/img/load.gif';
+//$loadGifPath: $IMAGE_ASSET_PATH + 'assets/img/load.gif';
+$loadGifPath: image-url('load.gif');
 
 /* Library list */
 .annotation-paging {
@@ -68,7 +69,7 @@ $loadGifPath: $IMAGE_ASSET_PATH + 'assets/img/load.gif';
   padding: 0 !important;
   margin: 0;
   border: 1px dotted #8c8c8c;
-  background: url(#{$loadGifPath}) center center no-repeat;
+  background: $loadGifPath center center no-repeat;
 
   & img {
 

diff --git a/src/app/annotationViewer/_annotation_viewer.scss b/src/app/annotationViewer/_annotation_viewer.scss
@@ -9,7 +9,10 @@ $marqueeBorderColorSelected: #FFFF00;
 $marqueeBorderColorSelectedGlow: #f7ffef;
 $marqueeBorderColorHover: #00ffe9;
 $marqueeBorderColorInactive: #00FF00;
-$loadGifPath: $IMAGE_ASSET_PATH + 'assets/img/load.gif';
+//loadGifPath: $IMAGE_ASSET_PATH + 'assets/img/load.gif';
+$loadGifPath:  image-url('load.gif');
+$crosshairGif: image-url('../cursor/crosshair.gif');
+$crosshairCur: image-url('../cursor/crosshair.cur');
 
 // see _touch.scss and annotate.tpl.html
 $grab-handle-radius: 12px;
@@ -23,7 +26,7 @@ baw-annotation-viewer {
   display: block;
 
   & .annotation-viewer-ctrl {
-    background: url(#{$loadGifPath}) center center no-repeat;
+    background: $loadGifPath center center no-repeat;
   }
 
   & #scroller {
@@ -127,7 +130,7 @@ baw-annotation-viewer {
 
       // required for IE10
       background-color: rgba(255, 255, 255, 0);
-      cursor:url(#{$IMAGE_ASSET_PATH + 'assets/cursor/crosshair.gif'}) 8 9, url(#{$IMAGE_ASSET_PATH + 'assets/cursor/crosshair.cur'}) 8 9, crosshair;
+      cursor: $crosshairGif 8 9, $crosshairCur 8 9, crosshair;
     }
 
     & .positionLine {

diff --git a/src/components/models/tag.spec.js b/src/components/models/tag.spec.js
@@ -33,7 +33,7 @@ describe("The Tag object", function () {
             baw.Tag(true);
         };
 
-        expect(func).toThrow("Constructor called as a function");
+        expect(func).toThrowError("Constructor called as a function");
     });
 
     it("should throw if not given a bool or object", function () {

diff --git a/src/sass/application.tpl.scss b/src/sass/application.tpl.scss
@@ -8,7 +8,7 @@
 $DEBUG: '<%= build_configs.current.key === "development" %>' == 'true';
 //@debug "Debug build is #{$DEBUG}";
 
-$IMAGE_ASSET_PATH: '<%= build_configs.current.siteDir %>';
+//$IMAGE_ASSET_PATH: '<%= build_configs.current.siteDir %>';
 
 /**
 * First, we include jlong's Twitter Bootstrap SCSS files. Only the ones used in the