|
1 | | -// AngularJS v1.3.11 ie8 build |
| 1 | +// AngularJS v1.3.12 ie8 build |
2 | 2 |
|
3 | 3 | (function () { |
4 | 4 |
|
|
122 | 122 | }()); |
123 | 123 |
|
124 | 124 | /** |
125 | | - * @license AngularJS v1.3.11 |
| 125 | + * @license AngularJS v1.3.12 |
126 | 126 | * (c) 2010-2014 Google, Inc. http://angularjs.org |
127 | 127 | * License: MIT |
128 | 128 | */ |
@@ -177,7 +177,7 @@ function minErr(module, ErrorConstructor) { |
177 | 177 | return match; |
178 | 178 | }); |
179 | 179 |
|
180 | | - message = message + '\nhttp://errors.angularjs.org/1.3.11/' + |
| 180 | + message = message + '\nhttp://errors.angularjs.org/1.3.12/' + |
181 | 181 | (module ? module + '/' : '') + code; |
182 | 182 | for (i = 2; i < arguments.length; i++) { |
183 | 183 | message = message + (i == 2 ? '?' : '&') + 'p' + (i - 2) + '=' + |
@@ -504,8 +504,7 @@ function nextUid() { |
504 | 504 | function setHashKey(obj, h) { |
505 | 505 | if (h) { |
506 | 506 | obj.$$hashKey = h; |
507 | | - } |
508 | | - else { |
| 507 | + } else { |
509 | 508 | delete obj.$$hashKey; |
510 | 509 | } |
511 | 510 | } |
@@ -814,7 +813,7 @@ function isElement(node) { |
814 | 813 | function makeMap(str) { |
815 | 814 | var obj = {}, items = str.split(","), i; |
816 | 815 | for (i = 0; i < items.length; i++) |
817 | | - obj[ items[i] ] = true; |
| 816 | + obj[items[i]] = true; |
818 | 817 | return obj; |
819 | 818 | } |
820 | 819 |
|
@@ -1595,8 +1594,12 @@ function bootstrap(element, modules, config) { |
1595 | 1594 | forEach(extraModules, function(module) { |
1596 | 1595 | modules.push(module); |
1597 | 1596 | }); |
1598 | | - doBootstrap(); |
| 1597 | + return doBootstrap(); |
1599 | 1598 | }; |
| 1599 | + |
| 1600 | + if (isFunction(angular.resumeDeferredBootstrap)) { |
| 1601 | + angular.resumeDeferredBootstrap(); |
| 1602 | + } |
1600 | 1603 | } |
1601 | 1604 |
|
1602 | 1605 | /** |
@@ -2241,10 +2244,10 @@ function toDebugString(obj) { |
2241 | 2244 | * - `codeName` – `{string}` – Code name of the release, such as "jiggling-armfat". |
2242 | 2245 | */ |
2243 | 2246 | var version = { |
2244 | | - full: '1.3.11', // all of these placeholder strings will be replaced by grunt's |
| 2247 | + full: '1.3.12', // all of these placeholder strings will be replaced by grunt's |
2245 | 2248 | major: 1, // package task |
2246 | 2249 | minor: 3, |
2247 | | - dot: 11, |
| 2250 | + dot: 12, |
2248 | 2251 | codeName: 'snapshot' |
2249 | 2252 | }; |
2250 | 2253 |
|
@@ -4280,7 +4283,7 @@ function createInjector(modulesToLoad, strictDi) { |
4280 | 4283 | } |
4281 | 4284 |
|
4282 | 4285 | var args = [], |
4283 | | - $inject = annotate(fn, strictDi, serviceName), |
| 4286 | + $inject = createInjector.$$annotate(fn, strictDi, serviceName), |
4284 | 4287 | length, i, |
4285 | 4288 | key; |
4286 | 4289 |
|
@@ -4319,7 +4322,7 @@ function createInjector(modulesToLoad, strictDi) { |
4319 | 4322 | invoke: invoke, |
4320 | 4323 | instantiate: instantiate, |
4321 | 4324 | get: getService, |
4322 | | - annotate: annotate, |
| 4325 | + annotate: createInjector.$$annotate, |
4323 | 4326 | has: function(name) { |
4324 | 4327 | return providerCache.hasOwnProperty(name + providerSuffix) || cache.hasOwnProperty(name); |
4325 | 4328 | } |
@@ -7993,8 +7996,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) { |
7993 | 7996 | afterTemplateChildLinkFn, |
7994 | 7997 | beforeTemplateCompileNode = $compileNode[0], |
7995 | 7998 | origAsyncDirective = directives.shift(), |
7996 | | - // The fact that we have to copy and patch the directive seems wrong! |
7997 | | - derivedSyncDirective = extend({}, origAsyncDirective, { |
| 7999 | + derivedSyncDirective = inherit(origAsyncDirective, { |
7998 | 8000 | templateUrl: null, transclude: null, replace: null, $$originalDirective: origAsyncDirective |
7999 | 8001 | }), |
8000 | 8002 | templateUrl = (isFunction(origAsyncDirective.templateUrl)) |
@@ -8447,6 +8449,8 @@ function removeComments(jqNodes) { |
8447 | 8449 | return jqNodes; |
8448 | 8450 | } |
8449 | 8451 |
|
| 8452 | +var $controllerMinErr = minErr('$controller'); |
| 8453 | + |
8450 | 8454 | /** |
8451 | 8455 | * @ngdoc provider |
8452 | 8456 | * @name $controllerProvider |
@@ -8534,7 +8538,12 @@ function $ControllerProvider() { |
8534 | 8538 | } |
8535 | 8539 |
|
8536 | 8540 | if (isString(expression)) { |
8537 | | - match = expression.match(CNTRL_REG), |
| 8541 | + match = expression.match(CNTRL_REG); |
| 8542 | + if (!match) { |
| 8543 | + throw $controllerMinErr('ctrlfmt', |
| 8544 | + "Badly formed controller string '{0}'. " + |
| 8545 | + "Must match `__name__ as __id__` or `__name__`.", expression); |
| 8546 | + } |
8538 | 8547 | constructor = match[1], |
8539 | 8548 | identifier = identifier || match[3]; |
8540 | 8549 | expression = controllers.hasOwnProperty(constructor) |
@@ -12459,6 +12468,11 @@ Parser.prototype = { |
12459 | 12468 | ? fn.apply(context, args || []) |
12460 | 12469 | : fn(args[0], args[1], args[2], args[3], args[4]); |
12461 | 12470 |
|
| 12471 | + if (args) { |
| 12472 | + // Free-up the memory (arguments of the last function call). |
| 12473 | + args.length = 0; |
| 12474 | + } |
| 12475 | + |
12462 | 12476 | return ensureSafeObject(v, expressionText); |
12463 | 12477 | }; |
12464 | 12478 | }, |
@@ -13330,8 +13344,7 @@ function qFactory(nextTick, exceptionHandler) { |
13330 | 13344 | 'qcycle', |
13331 | 13345 | "Expected promise to be resolved with value other than itself '{0}'", |
13332 | 13346 | val)); |
13333 | | - } |
13334 | | - else { |
| 13347 | + } else { |
13335 | 13348 | this.$$resolve(val); |
13336 | 13349 | } |
13337 | 13350 |
|
@@ -24674,10 +24687,11 @@ var NG_HIDE_IN_PROGRESS_CLASS = 'ng-hide-animate'; |
24674 | 24687 | * |
24675 | 24688 | * By default, the `.ng-hide` class will style the element with `display: none!important`. If you wish to change |
24676 | 24689 | * the hide behavior with ngShow/ngHide then this can be achieved by restating the styles for the `.ng-hide` |
24677 | | - * class in CSS: |
| 24690 | + * class CSS. Note that the selector that needs to be used is actually `.ng-hide:not(.ng-hide-animate)` to cope |
| 24691 | + * with extra animation classes that can be added. |
24678 | 24692 | * |
24679 | 24693 | * ```css |
24680 | | - * .ng-hide { |
| 24694 | + * .ng-hide:not(.ng-hide-animate) { |
24681 | 24695 | * /* this is just another form of hiding an element */ |
24682 | 24696 | * display: block!important; |
24683 | 24697 | * position: absolute; |
@@ -26193,7 +26207,7 @@ var maxlengthDirective = function() { |
26193 | 26207 | ctrl.$validate(); |
26194 | 26208 | }); |
26195 | 26209 | ctrl.$validators.maxlength = function(modelValue, viewValue) { |
26196 | | - return (maxlength < 0) || ctrl.$isEmpty(modelValue) || (viewValue.length <= maxlength); |
| 26210 | + return (maxlength < 0) || ctrl.$isEmpty(viewValue) || (viewValue.length <= maxlength); |
26197 | 26211 | }; |
26198 | 26212 | } |
26199 | 26213 | }; |
|
0 commit comments