Skip to content

Commit e9a3fe5

Browse files
committed
update(angular): bump to 1.2.7
1 parent 3b0f852 commit e9a3fe5

27 files changed

+460
-350
lines changed

app/lib/angular/angular-animate.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.2.6
2+
* @license AngularJS v1.2.7
33
* (c) 2010-2014 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/
@@ -616,9 +616,14 @@ angular.module('ngAnimate', ['ng'])
616616
}
617617

618618
var animations = [];
619+
619620
//only add animations if the currently running animation is not structural
620621
//or if there is no animation running at all
621-
if(!ngAnimateState.running || !(isClassBased && ngAnimateState.structural)) {
622+
var allowAnimations = isClassBased ?
623+
!ngAnimateState.disabled && (!ngAnimateState.running || !ngAnimateState.structural) :
624+
true;
625+
626+
if(allowAnimations) {
622627
forEach(matches, function(animation) {
623628
//add the animation to the queue to if it is allowed to be cancelled
624629
if(!animation.allowCancel || animation.allowCancel(element, animationEvent, className)) {
@@ -1147,7 +1152,7 @@ angular.module('ngAnimate', ['ng'])
11471152
var propertyStyle = timings.transitionPropertyStyle;
11481153
if(propertyStyle.indexOf('all') == -1) {
11491154
style += CSS_PREFIX + 'transition-property: ' + propertyStyle + ';';
1150-
style += CSS_PREFIX + 'transition-duration: ' + timings.transitionDurationStyle + 's;';
1155+
style += CSS_PREFIX + 'transition-duration: ' + timings.transitionDurationStyle + ';';
11511156
appliedStyles.push(CSS_PREFIX + 'transition-property');
11521157
appliedStyles.push(CSS_PREFIX + 'transition-duration');
11531158
}

app/lib/angular/angular-animate.min.js

Lines changed: 17 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/lib/angular/angular-animate.min.js.map

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/lib/angular/angular-cookies.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.2.6
2+
* @license AngularJS v1.2.7
33
* (c) 2010-2014 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/

app/lib/angular/angular-cookies.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/lib/angular/angular-loader.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.2.6
2+
* @license AngularJS v1.2.7
33
* (c) 2010-2014 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/
@@ -69,7 +69,7 @@ function minErr(module) {
6969
return match;
7070
});
7171

72-
message = message + '\nhttp://errors.angularjs.org/1.2.6/' +
72+
message = message + '\nhttp://errors.angularjs.org/1.2.7/' +
7373
(module ? module + '/' : '') + code;
7474
for (i = 2; i < arguments.length; i++) {
7575
message = message + (i == 2 ? '?' : '&') + 'p' + (i-2) + '=' +

app/lib/angular/angular-loader.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/lib/angular/angular-resource.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.2.6
2+
* @license AngularJS v1.2.7
33
* (c) 2010-2014 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/
@@ -406,7 +406,7 @@ angular.module('ngResource', ['ng']).
406406
});
407407

408408
// strip trailing slashes and set the url
409-
url = url.replace(/\/+$/, '');
409+
url = url.replace(/\/+$/, '') || '/';
410410
// then replace collapse `/.` if found in the last URL path segment before the query
411411
// E.g. `http://url.com/id./format?q=x` becomes `http://url.com/id.format?q=x`
412412
url = url.replace(/\/\.(?=\w+($|\?))/, '.');

app/lib/angular/angular-resource.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)