From e739ce597908262fbff165c8c08a4ae733ce1138 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Wed, 21 Jan 2015 10:20:52 +0100 Subject: update angularjs --- js/bower.json | 2 +- js/vendor/angular-animate/.bower.json | 12 +- js/vendor/angular-animate/angular-animate.js | 4 +- js/vendor/angular-animate/angular-animate.min.js | 14 +- .../angular-animate/angular-animate.min.js.map | 4 +- js/vendor/angular-animate/bower.json | 4 +- js/vendor/angular-animate/package.json | 2 +- js/vendor/angular-mocks/.bower.json | 10 +- js/vendor/angular-mocks/angular-mocks.js | 20 +- js/vendor/angular-mocks/bower.json | 4 +- js/vendor/angular-mocks/package.json | 2 +- js/vendor/angular-route/.bower.json | 10 +- js/vendor/angular-route/angular-route.js | 2 +- js/vendor/angular-route/angular-route.min.js | 2 +- js/vendor/angular-route/bower.json | 4 +- js/vendor/angular-route/package.json | 2 +- js/vendor/angular-sanitize/.bower.json | 10 +- js/vendor/angular-sanitize/angular-sanitize.js | 2 +- js/vendor/angular-sanitize/angular-sanitize.min.js | 2 +- js/vendor/angular-sanitize/bower.json | 4 +- js/vendor/angular-sanitize/package.json | 2 +- js/vendor/angular/.bower.json | 8 +- js/vendor/angular/angular.js | 6709 ++++++++++---------- js/vendor/angular/angular.min.js | 418 +- js/vendor/angular/angular.min.js.gzip | Bin 45930 -> 45960 bytes js/vendor/angular/angular.min.js.map | 4 +- js/vendor/angular/bower.json | 2 +- js/vendor/angular/package.json | 2 +- 28 files changed, 3641 insertions(+), 3620 deletions(-) diff --git a/js/bower.json b/js/bower.json index 4a32f6b45..22fabc8da 100644 --- a/js/bower.json +++ b/js/bower.json @@ -30,6 +30,6 @@ "jquery": "~2.*", "momentjs": "~2.8.*", "es6-shim": "~0.18.*", - "angular-animate": "~1.3.3" + "angular-animate": "~1.3.*" } } diff --git a/js/vendor/angular-animate/.bower.json b/js/vendor/angular-animate/.bower.json index 171a0cab5..d91c9507d 100644 --- a/js/vendor/angular-animate/.bower.json +++ b/js/vendor/angular-animate/.bower.json @@ -1,19 +1,19 @@ { "name": "angular-animate", - "version": "1.3.8", + "version": "1.3.10", "main": "./angular-animate.js", "ignore": [], "dependencies": { - "angular": "1.3.8" + "angular": "1.3.10" }, "homepage": "https://github.com/angular/bower-angular-animate", - "_release": "1.3.8", + "_release": "1.3.10", "_resolution": { "type": "version", - "tag": "v1.3.8", - "commit": "673c705af49bb71c0b81c31b446b2f636cecd990" + "tag": "v1.3.10", + "commit": "ae99c60870b78d1bcd01135d4412feaddd8b0959" }, "_source": "git://github.com/angular/bower-angular-animate.git", - "_target": "~1.3.3", + "_target": "~1.3.*", "_originalSource": "angular-animate" } \ No newline at end of file diff --git a/js/vendor/angular-animate/angular-animate.js b/js/vendor/angular-animate/angular-animate.js index eca7ca4c3..2014baec7 100644 --- a/js/vendor/angular-animate/angular-animate.js +++ b/js/vendor/angular-animate/angular-animate.js @@ -1,5 +1,5 @@ /** - * @license AngularJS v1.3.8 + * @license AngularJS v1.3.10 * (c) 2010-2014 Google, Inc. http://angularjs.org * License: MIT */ @@ -1875,7 +1875,7 @@ angular.module('ngAnimate', ['ng']) return; } - if (!staggerTime && styles) { + if (!staggerTime && styles && Object.keys(styles).length > 0) { if (!timings.transitionDuration) { element.css('transition', timings.animationDuration + 's linear all'); appliedStyles.push('transition'); diff --git a/js/vendor/angular-animate/angular-animate.min.js b/js/vendor/angular-animate/angular-animate.min.js index 2ea6b954a..b406578de 100644 --- a/js/vendor/angular-animate/angular-animate.min.js +++ b/js/vendor/angular-animate/angular-animate.min.js @@ -1,5 +1,5 @@ /* - AngularJS v1.3.8 + AngularJS v1.3.10 (c) 2010-2014 Google, Inc. http://angularjs.org License: MIT */ @@ -24,10 +24,10 @@ function(a){a()});c=[];b=null;x={}})}function P(a,e){var b=g(a);a=f.element(b);k 0,m={};if(0=C&&b>=x&&c()}var m=g(e);a=e.data("$$ngAnimateCSS3Data");if(-1!=m.getAttribute("class").indexOf(b)&&a){var k="",t="";n(b.split(" "),function(a, b){var e=(0