Skip to content

Commit e140c1c

Browse files
committed
Update to 1.3.12
1 parent b93dc08 commit e140c1c

File tree

4 files changed

+285
-272
lines changed

4 files changed

+285
-272
lines changed

dist/angular.js

Lines changed: 33 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// AngularJS v1.3.11 ie8 build
1+
// AngularJS v1.3.12 ie8 build
22

33
(function () {
44

@@ -122,7 +122,7 @@
122122
}());
123123

124124
/**
125-
* @license AngularJS v1.3.11
125+
* @license AngularJS v1.3.12
126126
* (c) 2010-2014 Google, Inc. http://angularjs.org
127127
* License: MIT
128128
*/
@@ -177,7 +177,7 @@ function minErr(module, ErrorConstructor) {
177177
return match;
178178
});
179179

180-
message = message + '\nhttp://errors.angularjs.org/1.3.11/' +
180+
message = message + '\nhttp://errors.angularjs.org/1.3.12/' +
181181
(module ? module + '/' : '') + code;
182182
for (i = 2; i < arguments.length; i++) {
183183
message = message + (i == 2 ? '?' : '&') + 'p' + (i - 2) + '=' +
@@ -504,8 +504,7 @@ function nextUid() {
504504
function setHashKey(obj, h) {
505505
if (h) {
506506
obj.$$hashKey = h;
507-
}
508-
else {
507+
} else {
509508
delete obj.$$hashKey;
510509
}
511510
}
@@ -814,7 +813,7 @@ function isElement(node) {
814813
function makeMap(str) {
815814
var obj = {}, items = str.split(","), i;
816815
for (i = 0; i < items.length; i++)
817-
obj[ items[i] ] = true;
816+
obj[items[i]] = true;
818817
return obj;
819818
}
820819

@@ -1595,8 +1594,12 @@ function bootstrap(element, modules, config) {
15951594
forEach(extraModules, function(module) {
15961595
modules.push(module);
15971596
});
1598-
doBootstrap();
1597+
return doBootstrap();
15991598
};
1599+
1600+
if (isFunction(angular.resumeDeferredBootstrap)) {
1601+
angular.resumeDeferredBootstrap();
1602+
}
16001603
}
16011604

16021605
/**
@@ -2241,10 +2244,10 @@ function toDebugString(obj) {
22412244
* - `codeName` – `{string}` – Code name of the release, such as "jiggling-armfat".
22422245
*/
22432246
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
22452248
major: 1, // package task
22462249
minor: 3,
2247-
dot: 11,
2250+
dot: 12,
22482251
codeName: 'snapshot'
22492252
};
22502253

@@ -4280,7 +4283,7 @@ function createInjector(modulesToLoad, strictDi) {
42804283
}
42814284

42824285
var args = [],
4283-
$inject = annotate(fn, strictDi, serviceName),
4286+
$inject = createInjector.$$annotate(fn, strictDi, serviceName),
42844287
length, i,
42854288
key;
42864289

@@ -4319,7 +4322,7 @@ function createInjector(modulesToLoad, strictDi) {
43194322
invoke: invoke,
43204323
instantiate: instantiate,
43214324
get: getService,
4322-
annotate: annotate,
4325+
annotate: createInjector.$$annotate,
43234326
has: function(name) {
43244327
return providerCache.hasOwnProperty(name + providerSuffix) || cache.hasOwnProperty(name);
43254328
}
@@ -7993,8 +7996,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
79937996
afterTemplateChildLinkFn,
79947997
beforeTemplateCompileNode = $compileNode[0],
79957998
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, {
79988000
templateUrl: null, transclude: null, replace: null, $$originalDirective: origAsyncDirective
79998001
}),
80008002
templateUrl = (isFunction(origAsyncDirective.templateUrl))
@@ -8447,6 +8449,8 @@ function removeComments(jqNodes) {
84478449
return jqNodes;
84488450
}
84498451

8452+
var $controllerMinErr = minErr('$controller');
8453+
84508454
/**
84518455
* @ngdoc provider
84528456
* @name $controllerProvider
@@ -8534,7 +8538,12 @@ function $ControllerProvider() {
85348538
}
85358539

85368540
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+
}
85388547
constructor = match[1],
85398548
identifier = identifier || match[3];
85408549
expression = controllers.hasOwnProperty(constructor)
@@ -12459,6 +12468,11 @@ Parser.prototype = {
1245912468
? fn.apply(context, args || [])
1246012469
: fn(args[0], args[1], args[2], args[3], args[4]);
1246112470

12471+
if (args) {
12472+
// Free-up the memory (arguments of the last function call).
12473+
args.length = 0;
12474+
}
12475+
1246212476
return ensureSafeObject(v, expressionText);
1246312477
};
1246412478
},
@@ -13330,8 +13344,7 @@ function qFactory(nextTick, exceptionHandler) {
1333013344
'qcycle',
1333113345
"Expected promise to be resolved with value other than itself '{0}'",
1333213346
val));
13333-
}
13334-
else {
13347+
} else {
1333513348
this.$$resolve(val);
1333613349
}
1333713350

@@ -24674,10 +24687,11 @@ var NG_HIDE_IN_PROGRESS_CLASS = 'ng-hide-animate';
2467424687
*
2467524688
* By default, the `.ng-hide` class will style the element with `display: none!important`. If you wish to change
2467624689
* 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.
2467824692
*
2467924693
* ```css
24680-
* .ng-hide {
24694+
* .ng-hide:not(.ng-hide-animate) {
2468124695
* /&#42; this is just another form of hiding an element &#42;/
2468224696
* display: block!important;
2468324697
* position: absolute;
@@ -26193,7 +26207,7 @@ var maxlengthDirective = function() {
2619326207
ctrl.$validate();
2619426208
});
2619526209
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);
2619726211
};
2619826212
}
2619926213
};

0 commit comments

Comments
 (0)