Stable Version 4.3.1.

Fixes #190
jmdobry · Jul 7, 2015 · ac58584 · ac58584
1 parent 43b547d
commit ac58584
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+##### 4.3.1 07 July 2015
+
+- #190 - 4.3 breaks phantomJS tests
+
 ##### 4.3.0 06 July 2015
 
 - #189 - Extracted non-angular code.

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -95,7 +95,7 @@ module.exports = function (grunt) {
         singleRun: false
       },
       min: {
-        browsers: ['Chrome', 'Firefox'],
+        browsers: ['Chrome', 'Firefox', 'PhantomJS'],
         options: {
           files: [
             'bower_components/angular-1.2.25/angular.js',

diff --git a/dist/angular-cache.js b/dist/angular-cache.js
@@ -1,6 +1,6 @@
 /*!
  * angular-cache
- * @version 4.3.0 - Homepage <http://jmdobry.github.io/angular-cache/>
+ * @version 4.3.1 - Homepage <http://jmdobry.github.io/angular-cache/>
  * @author Jason Dobry <[email protected]>
  * @copyright (c) 2013-2015 Jason Dobry 
  * @license MIT <https://github.com/jmdobry/angular-cache/blob/master/LICENSE>
@@ -108,7 +108,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	/*!
 	 * cachefactory
-	 * @version 1.0.1 - Homepage <http://jmdobry.github.io/cachefactory/>
+	 * @version 1.0.2 - Homepage <http://jmdobry.github.io/cachefactory/>
 	 * @author Jason Dobry <[email protected]>
 	 * @copyright (c) 2013-2015 Jason Dobry 
 	 * @license MIT <https://github.com/jmdobry/cachefactory/blob/master/LICENSE>
@@ -172,6 +172,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	/***/ function(module, exports, __webpack_require__) {
 
 		var BinaryHeap = __webpack_require__(1);
+		var _Promise = null;
+		try {
+		  _Promise = window.Promise;
+		} catch (e) {}
+
 		var utils = {
 		  isNumber: function isNumber(val) {
 		    return typeof val === 'number';
@@ -197,7 +202,7 @@ return /******/ (function(modules) { // webpackBootstrap
 		    return a === b;
 		  },
 
-		  Promise: Promise
+		  Promise: _Promise
 		};
 
 		var _keys = function _keys(collection) {
@@ -490,7 +495,11 @@ return /******/ (function(modules) { // webpackBootstrap
 		            }
 		          }
 		          if (isError) {
-		            return utils.Promise.reject(v);
+		            if (utils.Promise) {
+		              return utils.Promise.reject(v);
+		            } else {
+		              throw v;
+		            }
 		          } else {
 		            return v;
 		          }

diff --git a/dist/angular-cache.min.js b/dist/angular-cache.min.js
diff --git a/dist/angular-cache.min.map b/dist/angular-cache.min.map
diff --git a/karma.conf.js b/karma.conf.js
@@ -2,7 +2,7 @@ module.exports = function (config) {
   config.set({
     basePath: './',
     frameworks: ['mocha', 'chai', 'sinon'],
-    browsers: ['Chrome', 'Firefox'],
+    browsers: ['Chrome', 'Firefox', 'PhantomJS'],
     files: [
       'bower_components/angular-1.2.25/angular.js',
       'bower_components/angular-resource/angular-resource.js',

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "angular-cache",
   "description": "angular-cache is a very useful replacement for Angular's $cacheFactory.",
-  "version": "4.3.0",
+  "version": "4.3.1",
   "homepage": "http://jmdobry.github.io/angular-cache/",
   "main": "dist/angular-cache.js",
   "repository": {
@@ -43,6 +43,7 @@
     "karma-script-launcher": "0.1.0",
     "karma-sinon": "1.0.4",
     "mocha": "2.2.5",
+    "phantomjs": "^1.9.17",
     "sinon": "1.15.4",
     "time-grunt": "1.2.1",
     "webpack-dev-server": "1.10.1"
@@ -54,6 +55,6 @@
     "angular": ">=1.x"
   },
   "dependencies": {
-    "cachefactory": "1.x"
+    "cachefactory": "1.0.2"
   }
 }