Skip to content

Commit c5c5408

Browse files
committed
BUMP ANGULAR VERSION to 1.2.7
1 parent fd77e40 commit c5c5408

27 files changed

+462
-351
lines changed

app/index-async.html

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,16 @@
1414
<script>
1515
// include angular loader, which allows the files to load in any order
1616
/*
17-
AngularJS v1.2.6
17+
AngularJS v1.2.7
1818
(c) 2010-2014 Google, Inc. http://angularjs.org
1919
License: MIT
2020
*/
21-
(function(){'use strict';function d(a){return function(){var c=arguments[0],b,c="["+(a?a+":":"")+c+"] http://errors.angularjs.org/1.2.6/"+(a?a+"/":"")+c;for(b=1;b<arguments.length;b++)c=c+(1==b?"?":"&")+"p"+(b-1)+"="+encodeURIComponent("function"==typeof arguments[b]?arguments[b].toString().replace(/ \{[\s\S]*$/,""):"undefined"==typeof arguments[b]?"undefined":"string"!=typeof arguments[b]?JSON.stringify(arguments[b]):arguments[b]);return Error(c)}}(function(a){var c=d("$injector"),b=d("ng");a=a.angular||
21+
(function(){'use strict';function d(a){return function(){var c=arguments[0],b,c="["+(a?a+":":"")+c+"] http://errors.angularjs.org/1.2.7/"+(a?a+"/":"")+c;for(b=1;b<arguments.length;b++)c=c+(1==b?"?":"&")+"p"+(b-1)+"="+encodeURIComponent("function"==typeof arguments[b]?arguments[b].toString().replace(/ \{[\s\S]*$/,""):"undefined"==typeof arguments[b]?"undefined":"string"!=typeof arguments[b]?JSON.stringify(arguments[b]):arguments[b]);return Error(c)}}(function(a){var c=d("$injector"),b=d("ng");a=a.angular||
2222
(a.angular={});a.$$minErr=a.$$minErr||d;return a.module||(a.module=function(){var a={};return function(e,d,f){if("hasOwnProperty"===e)throw b("badname","module");d&&a.hasOwnProperty(e)&&(a[e]=null);return a[e]||(a[e]=function(){function a(c,d,e){return function(){b[e||"push"]([c,d,arguments]);return g}}if(!d)throw c("nomod",e);var b=[],h=[],k=a("$injector","invoke"),g={_invokeQueue:b,_runBlocks:h,requires:d,name:e,provider:a("$provide","provider"),factory:a("$provide","factory"),service:a("$provide",
2323
"service"),value:a("$provide","value"),constant:a("$provide","constant","unshift"),animation:a("$animateProvider","register"),filter:a("$filterProvider","register"),controller:a("$controllerProvider","register"),directive:a("$compileProvider","directive"),config:k,run:function(a){h.push(a);return this}};f&&k(f);return g}())}}())})(window)})(window);
2424

2525

26+
2627
// include a third-party async loader library
2728
/*!
2829
* $script.js v1.3

app/lib/angular/angular-animate.js

+8-3
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

+17-17
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

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

app/lib/angular/angular-cookies.js

+1-1
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

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

app/lib/angular/angular-loader.js

+2-2
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

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

app/lib/angular/angular-mocks.js

+5-1
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
*/
@@ -1579,6 +1579,10 @@ function MockHttpExpectation(method, url, data, headers) {
15791579
};
15801580
}
15811581

1582+
function createMockXhr() {
1583+
return new MockXhr();
1584+
}
1585+
15821586
function MockXhr() {
15831587

15841588
// hack for testing $http, $httpBackend

app/lib/angular/angular-resource.js

+2-2
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

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

0 commit comments

Comments
 (0)