Stable Version 4.2.2.

Fixes #165
jmdobry · Jul 1, 2015 · 9ba0574 · 9ba0574
1 parent a286c76
commit 9ba0574
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+##### 4.2.2 1 July 2015
+
+###### Backwards compatible bug fixes
+- #165 - storageMode does not inherits from defaults
+
+##### 4.2.1 1 July 2015
+
+Upgraded dependencies
+Better CommonJS interop
+Added a number of build examples
+
 ##### 4.2.0 27 April 2015
 
 ###### Backwards compatible bug fixes

diff --git a/dist/angular-cache.js b/dist/angular-cache.js
@@ -1,6 +1,6 @@
 /*!
  * angular-cache
- * @version 4.2.1 - Homepage <http://jmdobry.github.io/angular-cache/>
+ * @version 4.2.2 - 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>
@@ -829,7 +829,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	          }
 
 	          if ('storageMode' in cacheOptions || 'storageImpl' in cacheOptions) {
-	            this.setStorageMode(cacheOptions.storageMode, cacheOptions.storageImpl);
+	            this.setStorageMode(cacheOptions.storageMode || defaults.storageMode, cacheOptions.storageImpl || defaults.storageImpl);
 	          } else if (strict) {
 	            this.setStorageMode(defaults.storageMode, defaults.storageImpl);
 	          }

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/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.2.1",
+  "version": "4.2.2",
   "homepage": "http://jmdobry.github.io/angular-cache/",
   "main": "dist/angular-cache.js",
   "repository": {

diff --git a/src/index.js b/src/index.js
@@ -729,7 +729,7 @@ class CacheFactoryProvider {
             }
 
             if ('storageMode' in cacheOptions || 'storageImpl' in cacheOptions) {
-              this.setStorageMode(cacheOptions.storageMode, cacheOptions.storageImpl);
+              this.setStorageMode(cacheOptions.storageMode || defaults.storageMode, cacheOptions.storageImpl || defaults.storageImpl);
             } else if (strict) {
               this.setStorageMode(defaults.storageMode, defaults.storageImpl);
             }

diff --git a/test/unit/DSCacheFactory/index.test.js b/test/unit/DSCacheFactory/index.test.js
@@ -260,6 +260,9 @@ describe('CacheFactory(cacheId, options)', function () {
     }
     assert.equal(msg, 'storageMode must be "memory", "localStorage" or "sessionStorage"!');
     for (var i = 0; i < TYPES_EXCEPT_STRING.length; i++) {
+      if (!TYPES_EXCEPT_STRING[i]) {
+        continue;
+      }
       try {
         TestCacheFactory('storageModeCache' + i, { storageMode: TYPES_EXCEPT_STRING[i] });
         fail(TYPES_EXCEPT_STRING[i]);