diff options
Diffstat (limited to 'js/vendor/angular-mocks')
-rw-r--r-- | js/vendor/angular-mocks/.bower.json | 12 | ||||
-rw-r--r-- | js/vendor/angular-mocks/angular-mocks.js | 20 | ||||
-rw-r--r-- | js/vendor/angular-mocks/bower.json | 4 | ||||
-rw-r--r-- | js/vendor/angular-mocks/package.json | 2 |
4 files changed, 19 insertions, 19 deletions
diff --git a/js/vendor/angular-mocks/.bower.json b/js/vendor/angular-mocks/.bower.json index 54c785c74..4cda9bd63 100644 --- a/js/vendor/angular-mocks/.bower.json +++ b/js/vendor/angular-mocks/.bower.json @@ -1,19 +1,19 @@ { "name": "angular-mocks", - "version": "1.3.11", + "version": "1.4.0-build.3807+sha.b3a9bd3", "main": "./angular-mocks.js", "ignore": [], "dependencies": { - "angular": "1.3.11" + "angular": "1.4.0-build.3807+sha.b3a9bd3" }, "homepage": "https://github.com/angular/bower-angular-mocks", - "_release": "1.3.11", + "_release": "1.4.0-build.3807+sha.b3a9bd3", "_resolution": { "type": "version", - "tag": "v1.3.11", - "commit": "2457be05bbe0d16947e2a1a0add1798cbadd11d2" + "tag": "v1.4.0-build.3807+sha.b3a9bd3", + "commit": "1a366669cee3e8a0f99be7691e4e5f4fba18abae" }, "_source": "git://github.com/angular/bower-angular-mocks.git", - "_target": "~1.3.*", + "_target": "~1.4.*", "_originalSource": "angular-mocks" }
\ No newline at end of file diff --git a/js/vendor/angular-mocks/angular-mocks.js b/js/vendor/angular-mocks/angular-mocks.js index 2a411cc38..9f002236e 100644 --- a/js/vendor/angular-mocks/angular-mocks.js +++ b/js/vendor/angular-mocks/angular-mocks.js @@ -1,6 +1,6 @@ /** - * @license AngularJS v1.3.11 - * (c) 2010-2014 Google, Inc. http://angularjs.org + * @license AngularJS v1.4.0-build.3807+sha.b3a9bd3 + * (c) 2010-2015 Google, Inc. http://angularjs.org * License: MIT */ (function(window, angular, undefined) { @@ -581,20 +581,20 @@ function jsonStringToDate(string) { tzHour = 0, tzMin = 0; if (match[9]) { - tzHour = int(match[9] + match[10]); - tzMin = int(match[9] + match[11]); + tzHour = toInt(match[9] + match[10]); + tzMin = toInt(match[9] + match[11]); } - date.setUTCFullYear(int(match[1]), int(match[2]) - 1, int(match[3])); - date.setUTCHours(int(match[4] || 0) - tzHour, - int(match[5] || 0) - tzMin, - int(match[6] || 0), - int(match[7] || 0)); + date.setUTCFullYear(toInt(match[1]), toInt(match[2]) - 1, toInt(match[3])); + date.setUTCHours(toInt(match[4] || 0) - tzHour, + toInt(match[5] || 0) - tzMin, + toInt(match[6] || 0), + toInt(match[7] || 0)); return date; } return string; } -function int(str) { +function toInt(str) { return parseInt(str, 10); } diff --git a/js/vendor/angular-mocks/bower.json b/js/vendor/angular-mocks/bower.json index cd52be40d..544205577 100644 --- a/js/vendor/angular-mocks/bower.json +++ b/js/vendor/angular-mocks/bower.json @@ -1,9 +1,9 @@ { "name": "angular-mocks", - "version": "1.3.11", + "version": "1.4.0-build.3807+sha.b3a9bd3", "main": "./angular-mocks.js", "ignore": [], "dependencies": { - "angular": "1.3.11" + "angular": "1.4.0-build.3807+sha.b3a9bd3" } } diff --git a/js/vendor/angular-mocks/package.json b/js/vendor/angular-mocks/package.json index c32d09fbd..27249fd5b 100644 --- a/js/vendor/angular-mocks/package.json +++ b/js/vendor/angular-mocks/package.json @@ -1,6 +1,6 @@ { "name": "angular-mocks", - "version": "1.3.11", + "version": "1.4.0-build.3807+sha.b3a9bd3", "description": "AngularJS mocks for testing", "main": "angular-mocks.js", "scripts": { |