diff options
Diffstat (limited to 'js/vendor/angular/angular.js')
| -rw-r--r-- | js/vendor/angular/angular.js | 76 |
1 files changed, 39 insertions, 37 deletions
diff --git a/js/vendor/angular/angular.js b/js/vendor/angular/angular.js index d76150b0e..754f9aaf6 100644 --- a/js/vendor/angular/angular.js +++ b/js/vendor/angular/angular.js @@ -1,5 +1,5 @@ /** - * @license AngularJS v1.3.4 + * @license AngularJS v1.3.5 * (c) 2010-2014 Google, Inc. http://angularjs.org * License: MIT */ @@ -54,7 +54,7 @@ function minErr(module, ErrorConstructor) { return match; }); - message = message + '\nhttp://errors.angularjs.org/1.3.4/' + + message = message + '\nhttp://errors.angularjs.org/1.3.5/' + (module ? module + '/' : '') + code; for (i = 2; i < arguments.length; i++) { message = message + (i == 2 ? '?' : '&') + 'p' + (i - 2) + '=' + @@ -226,8 +226,8 @@ if ('i' !== 'I'.toLowerCase()) { } -var /** holds major version number for IE or NaN for real browsers */ - msie, +var + msie, // holds major version number for IE, or NaN if UA is not IE. jqLite, // delay binding since jQuery could be loaded after us. jQuery, // delay binding slice = [].slice, @@ -2100,11 +2100,11 @@ function toDebugString(obj) { * - `codeName` – `{string}` – Code name of the release, such as "jiggling-armfat". */ var version = { - full: '1.3.4', // all of these placeholder strings will be replaced by grunt's + full: '1.3.5', // all of these placeholder strings will be replaced by grunt's major: 1, // package task minor: 3, - dot: 4, - codeName: 'highfalutin-petroglyph' + dot: 5, + codeName: 'cybernetic-mercantilism' }; @@ -6467,7 +6467,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) { * Retrieves or overrides the default regular expression that is used for whitelisting of safe * urls during a[href] sanitization. * - * The sanitization is a security measure aimed at prevent XSS attacks via html links. + * The sanitization is a security measure aimed at preventing XSS attacks via html links. * * Any url about to be assigned to a[href] via data-binding is first normalized and turned into * an absolute url. Afterwards, the url is matched against the `aHrefSanitizationWhitelist` @@ -6534,7 +6534,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) { * * `ng-binding` CSS class * * `$binding` data property containing an array of the binding expressions * - * You may want to use this in production for a significant performance boost. See + * You may want to disable this in production for a significant performance boost. See * {@link guide/production#disabling-debug-data Disabling Debug Data} for more. * * The default value is true. @@ -9091,12 +9091,14 @@ function $HttpProvider() { * `{function(data, headersGetter)|Array.<function(data, headersGetter)>}` – * transform function or an array of such functions. The transform function takes the http * request body and headers and returns its transformed (typically serialized) version. - * See {@link #overriding-the-default-transformations-per-request Overriding the Default Transformations} + * See {@link ng.$http#overriding-the-default-transformations-per-request + * Overriding the Default Transformations} * - **transformResponse** – * `{function(data, headersGetter)|Array.<function(data, headersGetter)>}` – * transform function or an array of such functions. The transform function takes the http * response body and headers and returns its transformed (typically deserialized) version. - * See {@link #overriding-the-default-transformations-per-request Overriding the Default Transformations} + * See {@link ng.$http#overriding-the-default-transformations-per-request + * Overriding the Default Transformations} * - **cache** – `{boolean|Cache}` – If true, a default $http cache will be used to cache the * GET request, otherwise if a cache instance built with * {@link ng.$cacheFactory $cacheFactory}, this cache will be used for @@ -9746,7 +9748,9 @@ function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDoc function completeRequest(callback, status, response, headersString, statusText) { // cancel timeout and subsequent timeout promise resolution - timeoutId && $browserDefer.cancel(timeoutId); + if (timeoutId !== undefined) { + $browserDefer.cancel(timeoutId); + } jsonpDone = xhr = null; callback(status, response, headersString, statusText); @@ -12228,13 +12232,13 @@ Parser.prototype = { ensureSafeObject(context, expressionText); ensureSafeFunction(fn, expressionText); - // IE stupidity! (IE doesn't have apply for some native functions) + // IE doesn't have apply for some native functions var v = fn.apply ? fn.apply(context, args) : fn(args[0], args[1], args[2], args[3], args[4]); return ensureSafeObject(v, expressionText); - }; + }; }, // This is used with json array declaration @@ -15916,14 +15920,9 @@ function $TemplateRequestProvider() { var transformResponse = $http.defaults && $http.defaults.transformResponse; if (isArray(transformResponse)) { - var original = transformResponse; - transformResponse = []; - for (var i = 0; i < original.length; ++i) { - var transformer = original[i]; - if (transformer !== defaultHttpResponseTransform) { - transformResponse.push(transformer); - } - } + transformResponse = transformResponse.filter(function(transformer) { + return transformer !== defaultHttpResponseTransform; + }); } else if (transformResponse === defaultHttpResponseTransform) { transformResponse = null; } @@ -15941,12 +15940,12 @@ function $TemplateRequestProvider() { return html; }, handleError); - function handleError() { + function handleError(resp) { self.totalPendingRequests--; if (!ignoreRequestError) { throw $compileMinErr('tpload', 'Failed to load template: {0}', tpl); } - return $q.reject(); + return $q.reject(resp); } } @@ -17582,9 +17581,8 @@ var htmlAnchorDirective = valueFn({ * make the link go to the wrong URL if the user clicks it before * Angular has a chance to replace the `{{hash}}` markup with its * value. Until Angular replaces the markup the link will be broken - * and will most likely return a 404 error. - * - * The `ngHref` directive solves this problem. + * and will most likely return a 404 error. The `ngHref` directive + * solves this problem. * * The wrong way to write it: * ```html @@ -25136,7 +25134,6 @@ var scriptDirective = ['$templateCache', function($templateCache) { compile: function(element, attr) { if (attr.type == 'text/ng-template') { var templateUrl = attr.id, - // IE is not consistent, in scripts we have to read .text but in other nodes we have to read .textContent text = element[0].text; $templateCache.put(templateUrl, text); @@ -25357,7 +25354,7 @@ var selectDirective = ['$compile', '$parse', function($compile, $parse) { self.removeOption = function(value) { if (this.hasOption(value)) { delete optionsMap[value]; - if (ngModelCtrl.$viewValue == value) { + if (ngModelCtrl.$viewValue === value) { this.renderUnknownOption(value); } } @@ -25824,18 +25821,23 @@ var selectDirective = ['$compile', '$parse', function($compile, $parse) { updateLabelMap(labelMap, option.label, false); option.element.remove(); } - forEach(labelMap, function(count, label) { - if (count > 0) { - selectCtrl.addOption(label); - } else if (count < 0) { - selectCtrl.removeOption(label); - } - }); } // remove any excessive OPTGROUPs from select while (optionGroupsCache.length > groupIndex) { - optionGroupsCache.pop()[0].element.remove(); + // remove all the labels in the option group + optionGroup = optionGroupsCache.pop(); + for (index = 1; index < optionGroup.length; ++index) { + updateLabelMap(labelMap, optionGroup[index].label, false); + } + optionGroup[0].element.remove(); } + forEach(labelMap, function(count, label) { + if (count > 0) { + selectCtrl.addOption(label); + } else if (count < 0) { + selectCtrl.removeOption(label); + } + }); } } } |