Skip to content

Commit bcfecb4

Browse files
committed
feat(angular): upgrade to AngularJS v1.2.25
1 parent e0d728c commit bcfecb4

11 files changed

+249
-218
lines changed

Diff for: config/lib/js/angular/angular-animate.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.2.24
2+
* @license AngularJS v1.2.25
33
* (c) 2010-2014 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/

Diff for: config/lib/js/angular/angular-animate.min.js

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

Diff for: config/lib/js/angular/angular-mocks.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.2.24
2+
* @license AngularJS v1.2.25
33
* (c) 2010-2014 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/

Diff for: config/lib/js/angular/angular-resource.js

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.2.24
2+
* @license AngularJS v1.2.25
33
* (c) 2010-2014 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/
@@ -129,10 +129,16 @@ function shallowClearAndCopy(src, dst) {
129129
* `{function(data, headersGetter)|Array.<function(data, headersGetter)>}` –
130130
* transform function or an array of such functions. The transform function takes the http
131131
* request body and headers and returns its transformed (typically serialized) version.
132+
* By default, transformRequest will contain one function that checks if the request data is
133+
* an object and serializes to using `angular.toJson`. To prevent this behavior, set
134+
* `transformRequest` to an empty array: `transformRequest: []`
132135
* - **`transformResponse`** –
133136
* `{function(data, headersGetter)|Array.<function(data, headersGetter)>}` –
134137
* transform function or an array of such functions. The transform function takes the http
135138
* response body and headers and returns its transformed (typically deserialized) version.
139+
* By default, transformResponse will contain one function that checks if the response looks like
140+
* a JSON string and deserializes it using `angular.fromJson`. To prevent this behavior, set
141+
* `transformResponse` to an empty array: `transformResponse: []`
136142
* - **`cache`** – `{boolean|Cache}` – If true, a default $http cache will be used to cache the
137143
* GET request, otherwise if a cache instance built with
138144
* {@link ng.$cacheFactory $cacheFactory}, this cache will be used for

Diff for: config/lib/js/angular/angular-resource.min.js

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

Diff for: config/lib/js/angular/angular-sanitize.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.2.24
2+
* @license AngularJS v1.2.25
33
* (c) 2010-2014 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/

Diff for: config/lib/js/angular/angular-sanitize.min.js

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

Diff for: config/lib/js/angular/angular-scenario.js

+37-25
Original file line numberDiff line numberDiff line change
@@ -9790,7 +9790,7 @@ if ( typeof module === "object" && module && typeof module.exports === "object"
97909790
})( window );
97919791

97929792
/**
9793-
* @license AngularJS v1.2.24
9793+
* @license AngularJS v1.2.25
97949794
* (c) 2010-2014 Google, Inc. http://angularjs.org
97959795
* License: MIT
97969796
*/
@@ -9860,7 +9860,7 @@ function minErr(module) {
98609860
return match;
98619861
});
98629862

9863-
message = message + '\nhttp://errors.angularjs.org/1.2.24/' +
9863+
message = message + '\nhttp://errors.angularjs.org/1.2.25/' +
98649864
(module ? module + '/' : '') + code;
98659865
for (i = 2; i < arguments.length; i++) {
98669866
message = message + (i == 2 ? '?' : '&') + 'p' + (i-2) + '=' +
@@ -11779,11 +11779,11 @@ function setupModuleLoader(window) {
1177911779
* - `codeName` – `{string}` – Code name of the release, such as "jiggling-armfat".
1178011780
*/
1178111781
var version = {
11782-
full: '1.2.24', // all of these placeholder strings will be replaced by grunt's
11782+
full: '1.2.25', // all of these placeholder strings will be replaced by grunt's
1178311783
major: 1, // package task
1178411784
minor: 2,
11785-
dot: 24,
11786-
codeName: 'static-levitation'
11785+
dot: 25,
11786+
codeName: 'hypnotic-gesticulation'
1178711787
};
1178811788

1178911789

@@ -28913,14 +28913,13 @@ var forceAsyncEvents = {
2891328913
};
2891428914
forEach(
2891528915
'click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste'.split(' '),
28916-
function(name) {
28917-
var directiveName = directiveNormalize('ng-' + name);
28916+
function(eventName) {
28917+
var directiveName = directiveNormalize('ng-' + eventName);
2891828918
ngEventDirectives[directiveName] = ['$parse', '$rootScope', function($parse, $rootScope) {
2891928919
return {
2892028920
compile: function($element, attr) {
2892128921
var fn = $parse(attr[directiveName]);
2892228922
return function ngEventHandler(scope, element) {
28923-
var eventName = lowercase(name);
2892428923
element.on(eventName, function(event) {
2892528924
var callback = function() {
2892628925
fn(scope, {$event:event});
@@ -30447,8 +30446,8 @@ var ngRepeatDirective = ['$parse', '$animate', function($parse, $animate) {
3044730446
*
3044830447
* @description
3044930448
* The `ngShow` directive shows or hides the given HTML element based on the expression
30450-
* provided to the ngShow attribute. The element is shown or hidden by removing or adding
30451-
* the `ng-hide` CSS class onto the element. The `.ng-hide` CSS class is predefined
30449+
* provided to the `ngShow` attribute. The element is shown or hidden by removing or adding
30450+
* the `.ng-hide` CSS class onto the element. The `.ng-hide` CSS class is predefined
3045230451
* in AngularJS and sets the display style to none (using an !important flag).
3045330452
* For CSP mode please add `angular-csp.css` to your html file (see {@link ng.directive:ngCsp ngCsp}).
3045430453
*
@@ -30460,8 +30459,8 @@ var ngRepeatDirective = ['$parse', '$animate', function($parse, $animate) {
3046030459
* <div ng-show="myValue" class="ng-hide"></div>
3046130460
* ```
3046230461
*
30463-
* When the ngShow expression evaluates to false then the ng-hide CSS class is added to the class attribute
30464-
* on the element causing it to become hidden. When true, the ng-hide CSS class is removed
30462+
* When the `ngShow` expression evaluates to false then the `.ng-hide` CSS class is added to the class attribute
30463+
* on the element causing it to become hidden. When true, the `.ng-hide` CSS class is removed
3046530464
* from the element causing the element not to appear hidden.
3046630465
*
3046730466
* <div class="alert alert-warning">
@@ -30471,7 +30470,7 @@ var ngRepeatDirective = ['$parse', '$animate', function($parse, $animate) {
3047130470
*
3047230471
* ## Why is !important used?
3047330472
*
30474-
* You may be wondering why !important is used for the .ng-hide CSS class. This is because the `.ng-hide` selector
30473+
* You may be wondering why !important is used for the `.ng-hide` CSS class. This is because the `.ng-hide` selector
3047530474
* can be easily overridden by heavier selectors. For example, something as simple
3047630475
* as changing the display style on a HTML list item would make hidden elements appear visible.
3047730476
* This also becomes a bigger issue when dealing with CSS frameworks.
@@ -30480,7 +30479,7 @@ var ngRepeatDirective = ['$parse', '$animate', function($parse, $animate) {
3048030479
* specificity (when !important isn't used with any conflicting styles). If a developer chooses to override the
3048130480
* styling to change how to hide an element then it is just a matter of using !important in their own CSS code.
3048230481
*
30483-
* ### Overriding .ng-hide
30482+
* ### Overriding `.ng-hide`
3048430483
*
3048530484
* By default, the `.ng-hide` class will style the element with `display:none!important`. If you wish to change
3048630485
* the hide behavior with ngShow/ngHide then this can be achieved by restating the styles for the `.ng-hide`
@@ -30498,7 +30497,7 @@ var ngRepeatDirective = ['$parse', '$animate', function($parse, $animate) {
3049830497
*
3049930498
* By default you don't need to override in CSS anything and the animations will work around the display style.
3050030499
*
30501-
* ## A note about animations with ngShow
30500+
* ## A note about animations with `ngShow`
3050230501
*
3050330502
* Animations in ngShow/ngHide work with the show and hide events that are triggered when the directive expression
3050430503
* is true and false. This system works like the animation system present with ngClass except that
@@ -30523,8 +30522,8 @@ var ngRepeatDirective = ['$parse', '$animate', function($parse, $animate) {
3052330522
* property to block during animation states--ngAnimate will handle the style toggling automatically for you.
3052430523
*
3052530524
* @animations
30526-
* addClass: .ng-hide - happens after the ngShow expression evaluates to a truthy value and the just before contents are set to visible
30527-
* removeClass: .ng-hide - happens after the ngShow expression evaluates to a non truthy value and just before the contents are set to hidden
30525+
* addClass: `.ng-hide` - happens after the `ngShow` expression evaluates to a truthy value and the just before contents are set to visible
30526+
* removeClass: `.ng-hide` - happens after the `ngShow` expression evaluates to a non truthy value and just before the contents are set to hidden
3052830527
*
3052930528
* @element ANY
3053030529
* @param {expression} ngShow If the {@link guide/expression expression} is truthy
@@ -30604,7 +30603,7 @@ var ngShowDirective = ['$animate', function($animate) {
3060430603
*
3060530604
* @description
3060630605
* The `ngHide` directive shows or hides the given HTML element based on the expression
30607-
* provided to the ngHide attribute. The element is shown or hidden by removing or adding
30606+
* provided to the `ngHide` attribute. The element is shown or hidden by removing or adding
3060830607
* the `ng-hide` CSS class onto the element. The `.ng-hide` CSS class is predefined
3060930608
* in AngularJS and sets the display style to none (using an !important flag).
3061030609
* For CSP mode please add `angular-csp.css` to your html file (see {@link ng.directive:ngCsp ngCsp}).
@@ -30617,8 +30616,8 @@ var ngShowDirective = ['$animate', function($animate) {
3061730616
* <div ng-hide="myValue"></div>
3061830617
* ```
3061930618
*
30620-
* When the ngHide expression evaluates to true then the .ng-hide CSS class is added to the class attribute
30621-
* on the element causing it to become hidden. When false, the ng-hide CSS class is removed
30619+
* When the `.ngHide` expression evaluates to true then the `.ng-hide` CSS class is added to the class attribute
30620+
* on the element causing it to become hidden. When false, the `.ng-hide` CSS class is removed
3062230621
* from the element causing the element not to appear hidden.
3062330622
*
3062430623
* <div class="alert alert-warning">
@@ -30628,7 +30627,7 @@ var ngShowDirective = ['$animate', function($animate) {
3062830627
*
3062930628
* ## Why is !important used?
3063030629
*
30631-
* You may be wondering why !important is used for the .ng-hide CSS class. This is because the `.ng-hide` selector
30630+
* You may be wondering why !important is used for the `.ng-hide` CSS class. This is because the `.ng-hide` selector
3063230631
* can be easily overridden by heavier selectors. For example, something as simple
3063330632
* as changing the display style on a HTML list item would make hidden elements appear visible.
3063430633
* This also becomes a bigger issue when dealing with CSS frameworks.
@@ -30637,7 +30636,7 @@ var ngShowDirective = ['$animate', function($animate) {
3063730636
* specificity (when !important isn't used with any conflicting styles). If a developer chooses to override the
3063830637
* styling to change how to hide an element then it is just a matter of using !important in their own CSS code.
3063930638
*
30640-
* ### Overriding .ng-hide
30639+
* ### Overriding `.ng-hide`
3064130640
*
3064230641
* By default, the `.ng-hide` class will style the element with `display:none!important`. If you wish to change
3064330642
* the hide behavior with ngShow/ngHide then this can be achieved by restating the styles for the `.ng-hide`
@@ -30655,7 +30654,7 @@ var ngShowDirective = ['$animate', function($animate) {
3065530654
*
3065630655
* By default you don't need to override in CSS anything and the animations will work around the display style.
3065730656
*
30658-
* ## A note about animations with ngHide
30657+
* ## A note about animations with `ngHide`
3065930658
*
3066030659
* Animations in ngShow/ngHide work with the show and hide events that are triggered when the directive expression
3066130660
* is true and false. This system works like the animation system present with ngClass, except that the `.ng-hide`
@@ -30679,8 +30678,8 @@ var ngShowDirective = ['$animate', function($animate) {
3067930678
* property to block during animation states--ngAnimate will handle the style toggling automatically for you.
3068030679
*
3068130680
* @animations
30682-
* removeClass: .ng-hide - happens after the ngHide expression evaluates to a truthy value and just before the contents are set to hidden
30683-
* addClass: .ng-hide - happens after the ngHide expression evaluates to a non truthy value and just before the contents are set to visible
30681+
* removeClass: `.ng-hide` - happens after the `ngHide` expression evaluates to a truthy value and just before the contents are set to hidden
30682+
* addClass: `.ng-hide` - happens after the `ngHide` expression evaluates to a non truthy value and just before the contents are set to visible
3068430683
*
3068530684
* @element ANY
3068630685
* @param {expression} ngHide If the {@link guide/expression expression} is truthy then
@@ -31533,6 +31532,19 @@ var selectDirective = ['$compile', '$parse', function($compile, $parse) {
3153331532
ctrl.$render = render;
3153431533

3153531534
scope.$watchCollection(valuesFn, render);
31535+
scope.$watchCollection(function () {
31536+
var locals = {},
31537+
values = valuesFn(scope);
31538+
if (values) {
31539+
var toDisplay = new Array(values.length);
31540+
for (var i = 0, ii = values.length; i < ii; i++) {
31541+
locals[valueName] = values[i];
31542+
toDisplay[i] = displayFn(scope, locals);
31543+
}
31544+
return toDisplay;
31545+
}
31546+
}, render);
31547+
3153631548
if ( multiple ) {
3153731549
scope.$watchCollection(function() { return ctrl.$modelValue; }, render);
3153831550
}

0 commit comments

Comments
 (0)