Skip to content

Commit ac58584

Browse files
committed
Stable Version 4.3.1.
Fixes #190
1 parent 43b547d commit ac58584

7 files changed

+25
-11
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
##### 4.3.1 07 July 2015
2+
3+
- #190 - 4.3 breaks phantomJS tests
4+
15
##### 4.3.0 06 July 2015
26

37
- #189 - Extracted non-angular code.

Gruntfile.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ module.exports = function (grunt) {
9595
singleRun: false
9696
},
9797
min: {
98-
browsers: ['Chrome', 'Firefox'],
98+
browsers: ['Chrome', 'Firefox', 'PhantomJS'],
9999
options: {
100100
files: [
101101
'bower_components/angular-1.2.25/angular.js',

dist/angular-cache.js

+13-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* angular-cache
3-
* @version 4.3.0 - Homepage <http://jmdobry.github.io/angular-cache/>
3+
* @version 4.3.1 - Homepage <http://jmdobry.github.io/angular-cache/>
44
* @author Jason Dobry <[email protected]>
55
* @copyright (c) 2013-2015 Jason Dobry
66
* @license MIT <https://github.com/jmdobry/angular-cache/blob/master/LICENSE>
@@ -108,7 +108,7 @@ return /******/ (function(modules) { // webpackBootstrap
108108

109109
/*!
110110
* cachefactory
111-
* @version 1.0.1 - Homepage <http://jmdobry.github.io/cachefactory/>
111+
* @version 1.0.2 - Homepage <http://jmdobry.github.io/cachefactory/>
112112
* @author Jason Dobry <[email protected]>
113113
* @copyright (c) 2013-2015 Jason Dobry
114114
* @license MIT <https://github.com/jmdobry/cachefactory/blob/master/LICENSE>
@@ -172,6 +172,11 @@ return /******/ (function(modules) { // webpackBootstrap
172172
/***/ function(module, exports, __webpack_require__) {
173173

174174
var BinaryHeap = __webpack_require__(1);
175+
var _Promise = null;
176+
try {
177+
_Promise = window.Promise;
178+
} catch (e) {}
179+
175180
var utils = {
176181
isNumber: function isNumber(val) {
177182
return typeof val === 'number';
@@ -197,7 +202,7 @@ return /******/ (function(modules) { // webpackBootstrap
197202
return a === b;
198203
},
199204

200-
Promise: Promise
205+
Promise: _Promise
201206
};
202207

203208
var _keys = function _keys(collection) {
@@ -490,7 +495,11 @@ return /******/ (function(modules) { // webpackBootstrap
490495
}
491496
}
492497
if (isError) {
493-
return utils.Promise.reject(v);
498+
if (utils.Promise) {
499+
return utils.Promise.reject(v);
500+
} else {
501+
throw v;
502+
}
494503
} else {
495504
return v;
496505
}

dist/angular-cache.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angular-cache.min.map

+1-1
Large diffs are not rendered by default.

karma.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module.exports = function (config) {
22
config.set({
33
basePath: './',
44
frameworks: ['mocha', 'chai', 'sinon'],
5-
browsers: ['Chrome', 'Firefox'],
5+
browsers: ['Chrome', 'Firefox', 'PhantomJS'],
66
files: [
77
'bower_components/angular-1.2.25/angular.js',
88
'bower_components/angular-resource/angular-resource.js',

package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "angular-cache",
33
"description": "angular-cache is a very useful replacement for Angular's $cacheFactory.",
4-
"version": "4.3.0",
4+
"version": "4.3.1",
55
"homepage": "http://jmdobry.github.io/angular-cache/",
66
"main": "dist/angular-cache.js",
77
"repository": {
@@ -43,6 +43,7 @@
4343
"karma-script-launcher": "0.1.0",
4444
"karma-sinon": "1.0.4",
4545
"mocha": "2.2.5",
46+
"phantomjs": "^1.9.17",
4647
"sinon": "1.15.4",
4748
"time-grunt": "1.2.1",
4849
"webpack-dev-server": "1.10.1"
@@ -54,6 +55,6 @@
5455
"angular": ">=1.x"
5556
},
5657
"dependencies": {
57-
"cachefactory": "1.x"
58+
"cachefactory": "1.0.2"
5859
}
5960
}

0 commit comments

Comments
 (0)