bump version 0.5.1

inkstak · Aug 26, 2014 · b1f42cd · b1f42cd
1 parent 5a74331
commit b1f42cd
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 Changelog
 ==========
 
+## 0.5.1
+- Reworked cache logic to allow cache:true ([#96](https://github.com/chieffancypants/angular-loading-bar/pull/96))
+
 ## 0.5.0
 - Added spinner template configuration ([#82](https://github.com/chieffancypants/angular-loading-bar/pull/82))
 - $timeout was not canceled properly ([#79](https://github.com/chieffancypants/angular-loading-bar/pull/79))

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013 Wes Cruver
+Copyright (c) 2013-2014 Wes Cruver
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-loading-bar",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "main": ["build/loading-bar.js", "build/loading-bar.css"],
   "ignore": [
     "**/.*",
@@ -10,7 +10,7 @@
     "example"
   ],
   "devDependencies": {
-    "angular-mocks": "~1.2.9",
-    "angular-animate": "~1.2.9"
+    "angular-mocks": "^1.2.9",
+    "angular-animate": "^1.2.9"
   }
 }
diff --git a/build/loading-bar.css b/build/loading-bar.css
@@ -1,5 +1,5 @@
 /*! 
- * angular-loading-bar v0.5.0
+ * angular-loading-bar v0.5.1
  * https://chieffancypants.github.io/angular-loading-bar
  * Copyright (c) 2014 Wes Cruver
  * License: MIT

diff --git a/build/loading-bar.js b/build/loading-bar.js
@@ -1,5 +1,5 @@
 /*! 
- * angular-loading-bar v0.5.0
+ * angular-loading-bar v0.5.1
  * https://chieffancypants.github.io/angular-loading-bar
  * Copyright (c) 2014 Wes Cruver
  * License: MIT
@@ -73,19 +73,15 @@ angular.module('cfp.loadingBarInterceptor', ['cfp.loadingBar'])
        */
       function isCached(config) {
         var cache;
+        var defaultCache = $cacheFactory.get('$http');
         var defaults = $httpProvider.defaults;
 
-        if (config.method !== 'GET' || config.cache === false) {
-          config.cached = false;
-          return false;
-        }
-
-        if (config.cache === true && defaults.cache === undefined) {
-          cache = $cacheFactory.get('$http');
-        } else if (defaults.cache !== undefined) {
-          cache = defaults.cache;
-        } else {
-          cache = config.cache;
+        // Choose the proper cache source. Borrowed from angular: $http service
+        if ((config.cache || defaults.cache) && config.cache !== false &&
+          (config.method === 'GET' || config.method === 'JSONP')) {
+            cache = angular.isObject(config.cache) ? config.cache
+              : angular.isObject(defaults.cache) ? defaults.cache
+              : defaultCache;
         }
 
         var cached = cache !== undefined ?

diff --git a/build/loading-bar.min.css b/build/loading-bar.min.css
diff --git a/build/loading-bar.min.js b/build/loading-bar.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-loading-bar",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "An automatic loading bar for AngularJS",
   "main": "src/loading-bar.js",
   "directories": {