You've already forked Sonarr
							
							
				mirror of
				https://github.com/Sonarr/Sonarr.git
				synced 2025-10-31 00:07:55 +02:00 
			
		
		
		
	updated js libraries,
require, jquery, backbone shortcuts backbone modelbinder
This commit is contained in:
		| @@ -1,4 +1,4 @@ | ||||
| // Backbone.ModelBinder v1.0.1 | ||||
| // Backbone.ModelBinder v1.0.2 | ||||
| // (c) 2013 Bart Wood | ||||
| // Distributed Under MIT License | ||||
|  | ||||
| @@ -26,7 +26,7 @@ | ||||
|     }; | ||||
|  | ||||
|     // Current version of the library. | ||||
|     Backbone.ModelBinder.VERSION = '1.0.1'; | ||||
|     Backbone.ModelBinder.VERSION = '1.0.2'; | ||||
|     Backbone.ModelBinder.Constants = {}; | ||||
|     Backbone.ModelBinder.Constants.ModelToView = 'ModelToView'; | ||||
|     Backbone.ModelBinder.Constants.ViewToModel = 'ViewToModel'; | ||||
| @@ -83,7 +83,7 @@ | ||||
|             this._options['modelSetOptions'].changeSource = 'ModelBinder'; | ||||
|  | ||||
|             if(!this._options['changeTriggers']){ | ||||
|                 this._options['changeTriggers'] = {'': 'change', '[contenteditable]': 'blur'}; | ||||
|                 this._options['changeTriggers'] = {'*': 'change', '[contenteditable]': 'blur'}; | ||||
|             } | ||||
|  | ||||
|             if(!this._options['initialCopyDirection']){ | ||||
| @@ -240,16 +240,10 @@ | ||||
|         }, | ||||
|  | ||||
|         _unbindViewToModel: function () { | ||||
|             if (this._rootEl) { | ||||
|                 if (this._triggers) { | ||||
|                     _.each(this._triggers, function (event, selector) { | ||||
|                         $(this._rootEl).undelegate(selector, event, this._onElChanged); | ||||
|                     }, this); | ||||
|                 } | ||||
|                 else { | ||||
|                     $(this._rootEl).undelegate('', 'change', this._onElChanged); | ||||
|                     $(this._rootEl).undelegate('[contenteditable]', 'blur', this._onElChanged); | ||||
|                 } | ||||
|             if(this._options && this._options['changeTriggers']){ | ||||
|                 _.each(this._options['changeTriggers'], function (event, selector) { | ||||
|                     $(this._rootEl).undelegate(selector, event, this._onElChanged); | ||||
|                 }, this); | ||||
|             } | ||||
|         }, | ||||
|  | ||||
| @@ -389,7 +383,9 @@ | ||||
|                     break; | ||||
|                 case 'class': | ||||
|                     var previousValue = this._model.previous(elementBinding.attributeBinding.attributeName); | ||||
|                     if(!_.isUndefined(previousValue)){ | ||||
| 		    var currentValue = this._model.get(elementBinding.attributeBinding.attributeName); | ||||
| 		    // is current value is now defined then remove the class the may have been set for the undefined value | ||||
|                     if(!_.isUndefined(previousValue) || !_.isUndefined(currentValue)){ | ||||
|                         previousValue = this._getConvertedValue(Backbone.ModelBinder.Constants.ModelToView, elementBinding, previousValue); | ||||
|                         el.removeClass(previousValue); | ||||
|                     } | ||||
|   | ||||
| @@ -16,8 +16,13 @@ | ||||
|       _results = []; | ||||
|       for (shortcut in _ref) { | ||||
|         callback = _ref[shortcut]; | ||||
|         if (!_.isFunction(callback)) method = this[callback]; | ||||
|         if (!method) throw new Error("Method " + callback + " does not exist"); | ||||
|         if (!_.isFunction(callback)){ | ||||
|               method = this[callback]; | ||||
|             if (!method) throw new Error("Method " + callback + " does not exist"); | ||||
|         } | ||||
|         else { | ||||
|             method = callback; | ||||
|         } | ||||
|         match = shortcut.match(/^(\S+)\s*(.*)$/); | ||||
|         shortcutKey = match[1]; | ||||
|         scope = match[2] === "" ? "all" : match[2]; | ||||
|   | ||||
							
								
								
									
										19167
									
								
								UI/JsLibraries/jquery.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										19167
									
								
								UI/JsLibraries/jquery.js
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -1,5 +1,5 @@ | ||||
| /** vim: et:ts=4:sw=4:sts=4 | ||||
|  * @license RequireJS 2.1.4 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved. | ||||
|  * @license RequireJS 2.1.5 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved. | ||||
|  * Available via the MIT or new BSD license. | ||||
|  * see: http://github.com/jrburke/requirejs for details | ||||
|  */ | ||||
| @@ -12,7 +12,7 @@ var requirejs, require, define; | ||||
| (function (global) { | ||||
|     var req, s, head, baseElement, dataMain, src, | ||||
|         interactiveScript, currentlyAddingScript, mainScript, subPath, | ||||
|         version = '2.1.4', | ||||
|         version = '2.1.5', | ||||
|         commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg, | ||||
|         cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g, | ||||
|         jsSuffixRegExp = /\.js$/, | ||||
| @@ -24,14 +24,14 @@ var requirejs, require, define; | ||||
|         apsp = ap.splice, | ||||
|         isBrowser = !!(typeof window !== 'undefined' && navigator && document), | ||||
|         isWebWorker = !isBrowser && typeof importScripts !== 'undefined', | ||||
|     //PS3 indicates loaded and complete, but need to wait for complete | ||||
|     //specifically. Sequence is 'loading', 'loaded', execution, | ||||
|     // then 'complete'. The UA check is unfortunate, but not sure how | ||||
|     //to feature test w/o causing perf issues. | ||||
|         //PS3 indicates loaded and complete, but need to wait for complete | ||||
|         //specifically. Sequence is 'loading', 'loaded', execution, | ||||
|         // then 'complete'. The UA check is unfortunate, but not sure how | ||||
|         //to feature test w/o causing perf issues. | ||||
|         readyRegExp = isBrowser && navigator.platform === 'PLAYSTATION 3' ? | ||||
|             /^complete$/ : /^(complete|loaded)$/, | ||||
|                       /^complete$/ : /^(complete|loaded)$/, | ||||
|         defContextName = '_', | ||||
|     //Oh the tragedy, detecting opera. See the usage of isOpera for reason. | ||||
|         //Oh the tragedy, detecting opera. See the usage of isOpera for reason. | ||||
|         isOpera = typeof opera !== 'undefined' && opera.toString() === '[object Opera]', | ||||
|         contexts = {}, | ||||
|         cfg = {}, | ||||
| @@ -191,15 +191,21 @@ var requirejs, require, define; | ||||
|         var inCheckLoaded, Module, context, handlers, | ||||
|             checkLoadedTimeoutId, | ||||
|             config = { | ||||
|                 //Defaults. Do not set a default for map | ||||
|                 //config to speed up normalize(), which | ||||
|                 //will run faster if there is no default. | ||||
|                 waitSeconds: 7, | ||||
|                 baseUrl: './', | ||||
|                 paths: {}, | ||||
|                 pkgs: {}, | ||||
|                 shim: {}, | ||||
|                 map: {}, | ||||
|                 config: {} | ||||
|             }, | ||||
|             registry = {}, | ||||
|             //registry of just enabled modules, to speed | ||||
|             //cycle breaking code when lots of modules | ||||
|             //are registered, but not activated. | ||||
|             enabledRegistry = {}, | ||||
|             undefEvents = {}, | ||||
|             defQueue = [], | ||||
|             defined = {}, | ||||
| @@ -295,7 +301,7 @@ var requirejs, require, define; | ||||
|             } | ||||
|  | ||||
|             //Apply map config if available. | ||||
|             if (applyMap && (baseParts || starMap) && map) { | ||||
|             if (applyMap && map && (baseParts || starMap)) { | ||||
|                 nameParts = name.split('/'); | ||||
|  | ||||
|                 for (i = nameParts.length; i > 0; i -= 1) { | ||||
| @@ -352,7 +358,7 @@ var requirejs, require, define; | ||||
|             if (isBrowser) { | ||||
|                 each(scripts(), function (scriptNode) { | ||||
|                     if (scriptNode.getAttribute('data-requiremodule') === name && | ||||
|                         scriptNode.getAttribute('data-requirecontext') === context.contextName) { | ||||
|                             scriptNode.getAttribute('data-requirecontext') === context.contextName) { | ||||
|                         scriptNode.parentNode.removeChild(scriptNode); | ||||
|                         return true; | ||||
|                     } | ||||
| @@ -456,8 +462,8 @@ var requirejs, require, define; | ||||
|             //normalization, stamp it with a unique ID so two matching relative | ||||
|             //ids that may conflict can be separate. | ||||
|             suffix = prefix && !pluginModule && !isNormalized ? | ||||
|                 '_unnormalized' + (unnormalizedCounter += 1) : | ||||
|                 ''; | ||||
|                      '_unnormalized' + (unnormalizedCounter += 1) : | ||||
|                      ''; | ||||
|  | ||||
|             return { | ||||
|                 prefix: prefix, | ||||
| @@ -468,8 +474,8 @@ var requirejs, require, define; | ||||
|                 originalName: originalName, | ||||
|                 isDefine: isDefine, | ||||
|                 id: (prefix ? | ||||
|                     prefix + '!' + normalizedName : | ||||
|                     normalizedName) + suffix | ||||
|                         prefix + '!' + normalizedName : | ||||
|                         normalizedName) + suffix | ||||
|             }; | ||||
|         } | ||||
|  | ||||
| @@ -489,7 +495,7 @@ var requirejs, require, define; | ||||
|                 mod = getOwn(registry, id); | ||||
|  | ||||
|             if (hasProp(defined, id) && | ||||
|                 (!mod || mod.defineEmitComplete)) { | ||||
|                     (!mod || mod.defineEmitComplete)) { | ||||
|                 if (name === 'defined') { | ||||
|                     fn(defined[id]); | ||||
|                 } | ||||
| @@ -534,7 +540,7 @@ var requirejs, require, define; | ||||
|                 //local var ref to defQueue, so cannot just reassign the one | ||||
|                 //on context. | ||||
|                 apsp.apply(defQueue, | ||||
|                     [defQueue.length - 1, 0].concat(globalDefQueue)); | ||||
|                            [defQueue.length - 1, 0].concat(globalDefQueue)); | ||||
|                 globalDefQueue = []; | ||||
|             } | ||||
|         } | ||||
| @@ -576,6 +582,7 @@ var requirejs, require, define; | ||||
|         function cleanRegistry(id) { | ||||
|             //Clean up machinery used for waiting modules. | ||||
|             delete registry[id]; | ||||
|             delete enabledRegistry[id]; | ||||
|         } | ||||
|  | ||||
|         function breakCycle(mod, traced, processed) { | ||||
| @@ -609,7 +616,7 @@ var requirejs, require, define; | ||||
|         function checkLoaded() { | ||||
|             var map, modId, err, usingPathFallback, | ||||
|                 waitInterval = config.waitSeconds * 1000, | ||||
|             //It is possible to disable the wait interval by using waitSeconds of 0. | ||||
|                 //It is possible to disable the wait interval by using waitSeconds of 0. | ||||
|                 expired = waitInterval && (context.startTime + waitInterval) < new Date().getTime(), | ||||
|                 noLoads = [], | ||||
|                 reqCalls = [], | ||||
| @@ -624,7 +631,7 @@ var requirejs, require, define; | ||||
|             inCheckLoaded = true; | ||||
|  | ||||
|             //Figure out the state of all the modules. | ||||
|             eachProp(registry, function (mod) { | ||||
|             eachProp(enabledRegistry, function (mod) { | ||||
|                 map = mod.map; | ||||
|                 modId = map.id; | ||||
|  | ||||
| @@ -704,9 +711,9 @@ var requirejs, require, define; | ||||
|             this.depCount = 0; | ||||
|  | ||||
|             /* this.exports this.factory | ||||
|              this.depMaps = [], | ||||
|              this.enabled, this.fetched | ||||
|              */ | ||||
|                this.depMaps = [], | ||||
|                this.enabled, this.fetched | ||||
|             */ | ||||
|         }; | ||||
|  | ||||
|         Module.prototype = { | ||||
| @@ -805,7 +812,7 @@ var requirejs, require, define; | ||||
|             }, | ||||
|  | ||||
|             /** | ||||
|              * Checks is the module is ready to define itself, and if so, | ||||
|              * Checks if the module is ready to define itself, and if so, | ||||
|              * define it. | ||||
|              */ | ||||
|             check: function () { | ||||
| @@ -850,9 +857,9 @@ var requirejs, require, define; | ||||
|                                 //favor a non-undefined return value over exports use. | ||||
|                                 cjsModule = this.module; | ||||
|                                 if (cjsModule && | ||||
|                                     cjsModule.exports !== undefined && | ||||
|                                     //Make sure it is not already the exports value | ||||
|                                     cjsModule.exports !== this.exports) { | ||||
|                                         cjsModule.exports !== undefined && | ||||
|                                         //Make sure it is not already the exports value | ||||
|                                         cjsModule.exports !== this.exports) { | ||||
|                                     exports = cjsModule.exports; | ||||
|                                 } else if (exports === undefined && this.usingExports) { | ||||
|                                     //exports already set the defined value. | ||||
| @@ -883,7 +890,7 @@ var requirejs, require, define; | ||||
|                         } | ||||
|  | ||||
|                         //Clean up | ||||
|                         delete registry[id]; | ||||
|                         cleanRegistry(id); | ||||
|  | ||||
|                         this.defined = true; | ||||
|                     } | ||||
| @@ -905,7 +912,7 @@ var requirejs, require, define; | ||||
|             callPlugin: function () { | ||||
|                 var map = this.map, | ||||
|                     id = map.id, | ||||
|                 //Map already normalized the prefix. | ||||
|                     //Map already normalized the prefix. | ||||
|                     pluginMap = makeModuleMap(map.prefix); | ||||
|  | ||||
|                 //Mark this as a dependency for this plugin, so it | ||||
| @@ -933,7 +940,7 @@ var requirejs, require, define; | ||||
|                         //prefix and name should already be normalized, no need | ||||
|                         //for applying map config again either. | ||||
|                         normalizedMap = makeModuleMap(map.prefix + '!' + name, | ||||
|                             this.map.parentMap); | ||||
|                                                       this.map.parentMap); | ||||
|                         on(normalizedMap, | ||||
|                             'defined', bind(this, function (value) { | ||||
|                                 this.init([], function () { return value; }, null, { | ||||
| @@ -1016,10 +1023,10 @@ var requirejs, require, define; | ||||
|                             req.exec(text); | ||||
|                         } catch (e) { | ||||
|                             return onError(makeError('fromtexteval', | ||||
|                                 'fromText eval for ' + id + | ||||
|                                     ' failed: ' + e, | ||||
|                                 e, | ||||
|                                 [id])); | ||||
|                                              'fromText eval for ' + id + | ||||
|                                             ' failed: ' + e, | ||||
|                                              e, | ||||
|                                              [id])); | ||||
|                         } | ||||
|  | ||||
|                         if (hasInteractive) { | ||||
| @@ -1049,6 +1056,7 @@ var requirejs, require, define; | ||||
|             }, | ||||
|  | ||||
|             enable: function () { | ||||
|                 enabledRegistry[this.map.id] = this; | ||||
|                 this.enabled = true; | ||||
|  | ||||
|                 //Set flag mentioning that the module is enabling, | ||||
| @@ -1065,9 +1073,9 @@ var requirejs, require, define; | ||||
|                         //Dependency needs to be converted to a depMap | ||||
|                         //and wired up to this module. | ||||
|                         depMap = makeModuleMap(depMap, | ||||
|                             (this.map.isDefine ? this.map : this.map.parentMap), | ||||
|                             false, | ||||
|                             !this.skipMap); | ||||
|                                                (this.map.isDefine ? this.map : this.map.parentMap), | ||||
|                                                false, | ||||
|                                                !this.skipMap); | ||||
|                         this.depMaps[i] = depMap; | ||||
|  | ||||
|                         handler = getOwn(handlers, depMap.id); | ||||
| @@ -1208,6 +1216,7 @@ var requirejs, require, define; | ||||
|             Module: Module, | ||||
|             makeModuleMap: makeModuleMap, | ||||
|             nextTick: req.nextTick, | ||||
|             onError: onError, | ||||
|  | ||||
|             /** | ||||
|              * Set a configuration for the context. | ||||
| @@ -1234,6 +1243,9 @@ var requirejs, require, define; | ||||
|                 eachProp(cfg, function (value, prop) { | ||||
|                     if (objs[prop]) { | ||||
|                         if (prop === 'map') { | ||||
|                             if (!config.map) { | ||||
|                                 config.map = {}; | ||||
|                             } | ||||
|                             mixin(config[prop], value, true, true); | ||||
|                         } else { | ||||
|                             mixin(config[prop], value, true); | ||||
| @@ -1279,8 +1291,8 @@ var requirejs, require, define; | ||||
|                             //envs have different conventions: some use a module name, | ||||
|                             //some use a file name. | ||||
|                             main: (pkgObj.main || 'main') | ||||
|                                 .replace(currDirRegExp, '') | ||||
|                                 .replace(jsSuffixRegExp, '') | ||||
|                                   .replace(currDirRegExp, '') | ||||
|                                   .replace(jsSuffixRegExp, '') | ||||
|                         }; | ||||
|                     }); | ||||
|  | ||||
| @@ -1345,7 +1357,7 @@ var requirejs, require, define; | ||||
|                         //Synchronous access to one module. If require.get is | ||||
|                         //available (as in the Node adapter), prefer that. | ||||
|                         if (req.get) { | ||||
|                             return req.get(context, deps, relMap); | ||||
|                             return req.get(context, deps, relMap, localRequire); | ||||
|                         } | ||||
|  | ||||
|                         //Normalize module name, if it contains . or .. | ||||
| @@ -1354,10 +1366,10 @@ var requirejs, require, define; | ||||
|  | ||||
|                         if (!hasProp(defined, id)) { | ||||
|                             return onError(makeError('notloaded', 'Module name "' + | ||||
|                                 id + | ||||
|                                 '" has not been loaded yet for context: ' + | ||||
|                                 contextName + | ||||
|                                 (relMap ? '' : '. Use require([])'))); | ||||
|                                         id + | ||||
|                                         '" has not been loaded yet for context: ' + | ||||
|                                         contextName + | ||||
|                                         (relMap ? '' : '. Use require([])'))); | ||||
|                         } | ||||
|                         return defined[id]; | ||||
|                     } | ||||
| @@ -1396,7 +1408,7 @@ var requirejs, require, define; | ||||
|                      * plain URLs like nameToUrl. | ||||
|                      */ | ||||
|                     toUrl: function (moduleNamePlusExt) { | ||||
|                         var ext, url, | ||||
|                         var ext, | ||||
|                             index = moduleNamePlusExt.lastIndexOf('.'), | ||||
|                             segment = moduleNamePlusExt.split('/')[0], | ||||
|                             isRelative = segment === '.' || segment === '..'; | ||||
| @@ -1408,9 +1420,8 @@ var requirejs, require, define; | ||||
|                             moduleNamePlusExt = moduleNamePlusExt.substring(0, index); | ||||
|                         } | ||||
|  | ||||
|                         url = context.nameToUrl(normalize(moduleNamePlusExt, | ||||
|                             relMap && relMap.id, true), ext || '.fake'); | ||||
|                         return ext ? url : url.substring(0, url.length - 5); | ||||
|                         return context.nameToUrl(normalize(moduleNamePlusExt, | ||||
|                                                 relMap && relMap.id, true), ext,  true); | ||||
|                     }, | ||||
|  | ||||
|                     defined: function (id) { | ||||
| @@ -1508,9 +1519,9 @@ var requirejs, require, define; | ||||
|                             return; | ||||
|                         } else { | ||||
|                             return onError(makeError('nodefine', | ||||
|                                 'No define call for ' + moduleName, | ||||
|                                 null, | ||||
|                                 [moduleName])); | ||||
|                                              'No define call for ' + moduleName, | ||||
|                                              null, | ||||
|                                              [moduleName])); | ||||
|                         } | ||||
|                     } else { | ||||
|                         //A script that does not call define(), so just simulate | ||||
| @@ -1529,7 +1540,7 @@ var requirejs, require, define; | ||||
|              * it is assumed to have already been normalized. This is an | ||||
|              * internal API, not a public one. Use toUrl for the public API. | ||||
|              */ | ||||
|             nameToUrl: function (moduleName, ext) { | ||||
|             nameToUrl: function (moduleName, ext, skipExt) { | ||||
|                 var paths, pkgs, pkg, pkgPath, syms, i, parentModule, url, | ||||
|                     parentPath; | ||||
|  | ||||
| @@ -1578,13 +1589,13 @@ var requirejs, require, define; | ||||
|  | ||||
|                     //Join the path parts together, then figure out if baseUrl is needed. | ||||
|                     url = syms.join('/'); | ||||
|                     url += (ext || (/\?/.test(url) ? '' : '.js')); | ||||
|                     url += (ext || (/\?/.test(url) || skipExt ? '' : '.js')); | ||||
|                     url = (url.charAt(0) === '/' || url.match(/^[\w\+\.\-]+:/) ? '' : config.baseUrl) + url; | ||||
|                 } | ||||
|  | ||||
|                 return config.urlArgs ? url + | ||||
|                     ((url.indexOf('?') === -1 ? '?' : '&') + | ||||
|                         config.urlArgs) : url; | ||||
|                                         ((url.indexOf('?') === -1 ? '?' : '&') + | ||||
|                                          config.urlArgs) : url; | ||||
|             }, | ||||
|  | ||||
|             //Delegates to req.load. Broken out as a separate function to | ||||
| @@ -1615,7 +1626,7 @@ var requirejs, require, define; | ||||
|                 //all old browsers will be supported, but this one was easy enough | ||||
|                 //to support and still makes sense. | ||||
|                 if (evt.type === 'load' || | ||||
|                     (readyRegExp.test((evt.currentTarget || evt.srcElement).readyState))) { | ||||
|                         (readyRegExp.test((evt.currentTarget || evt.srcElement).readyState))) { | ||||
|                     //Reset interactive script so a script node is not held onto for | ||||
|                     //to long. | ||||
|                     interactiveScript = null; | ||||
| @@ -1780,8 +1791,8 @@ var requirejs, require, define; | ||||
|         if (isBrowser) { | ||||
|             //In the browser so use a script tag | ||||
|             node = config.xhtml ? | ||||
|                 document.createElementNS('http://www.w3.org/1999/xhtml', 'html:script') : | ||||
|                 document.createElement('script'); | ||||
|                     document.createElementNS('http://www.w3.org/1999/xhtml', 'html:script') : | ||||
|                     document.createElement('script'); | ||||
|             node.type = config.scriptType || 'text/javascript'; | ||||
|             node.charset = 'utf-8'; | ||||
|             node.async = true; | ||||
| @@ -1798,15 +1809,15 @@ var requirejs, require, define; | ||||
|             //UNFORTUNATELY Opera implements attachEvent but does not follow the script | ||||
|             //script execution mode. | ||||
|             if (node.attachEvent && | ||||
|                 //Check if node.attachEvent is artificially added by custom script or | ||||
|                 //natively supported by browser | ||||
|                 //read https://github.com/jrburke/requirejs/issues/187 | ||||
|                 //if we can NOT find [native code] then it must NOT natively supported. | ||||
|                 //in IE8, node.attachEvent does not have toString() | ||||
|                 //Note the test for "[native code" with no closing brace, see: | ||||
|                 //https://github.com/jrburke/requirejs/issues/273 | ||||
|                 !(node.attachEvent.toString && node.attachEvent.toString().indexOf('[native code') < 0) && | ||||
|                 !isOpera) { | ||||
|                     //Check if node.attachEvent is artificially added by custom script or | ||||
|                     //natively supported by browser | ||||
|                     //read https://github.com/jrburke/requirejs/issues/187 | ||||
|                     //if we can NOT find [native code] then it must NOT natively supported. | ||||
|                     //in IE8, node.attachEvent does not have toString() | ||||
|                     //Note the test for "[native code" with no closing brace, see: | ||||
|                     //https://github.com/jrburke/requirejs/issues/273 | ||||
|                     !(node.attachEvent.toString && node.attachEvent.toString().indexOf('[native code') < 0) && | ||||
|                     !isOpera) { | ||||
|                 //Probably IE. IE (at least 6-8) do not fire | ||||
|                 //script onload right after executing the script, so | ||||
|                 //we cannot tie the anonymous define call to a name. | ||||
| @@ -1817,7 +1828,7 @@ var requirejs, require, define; | ||||
|                 node.attachEvent('onreadystatechange', context.onScriptLoad); | ||||
|                 //It would be great to add an error handler here to catch | ||||
|                 //404s in IE9+. However, onreadystatechange will fire before | ||||
|                 //the error handler, so that does not help. If addEvenListener | ||||
|                 //the error handler, so that does not help. If addEventListener | ||||
|                 //is used, then IE will fire error before load, but we cannot | ||||
|                 //use that pathway given the connect.microsoft.com issue | ||||
|                 //mentioned above about not doing the 'script execute, | ||||
| @@ -1846,16 +1857,24 @@ var requirejs, require, define; | ||||
|  | ||||
|             return node; | ||||
|         } else if (isWebWorker) { | ||||
|             //In a web worker, use importScripts. This is not a very | ||||
|             //efficient use of importScripts, importScripts will block until | ||||
|             //its script is downloaded and evaluated. However, if web workers | ||||
|             //are in play, the expectation that a build has been done so that | ||||
|             //only one script needs to be loaded anyway. This may need to be | ||||
|             //reevaluated if other use cases become common. | ||||
|             importScripts(url); | ||||
|             try { | ||||
|                 //In a web worker, use importScripts. This is not a very | ||||
|                 //efficient use of importScripts, importScripts will block until | ||||
|                 //its script is downloaded and evaluated. However, if web workers | ||||
|                 //are in play, the expectation that a build has been done so that | ||||
|                 //only one script needs to be loaded anyway. This may need to be | ||||
|                 //reevaluated if other use cases become common. | ||||
|                 importScripts(url); | ||||
|  | ||||
|             //Account for anonymous modules | ||||
|             context.completeLoad(moduleName); | ||||
|                 //Account for anonymous modules | ||||
|                 context.completeLoad(moduleName); | ||||
|             } catch (e) { | ||||
|                 context.onError(makeError('importscripts', | ||||
|                                 'importScripts failed for ' + | ||||
|                                     moduleName + ' at ' + url, | ||||
|                                 e, | ||||
|                                 [moduleName])); | ||||
|             } | ||||
|         } | ||||
|     }; | ||||
|  | ||||
| @@ -1932,12 +1951,13 @@ var requirejs, require, define; | ||||
|         //This module may not have dependencies | ||||
|         if (!isArray(deps)) { | ||||
|             callback = deps; | ||||
|             deps = []; | ||||
|             deps = null; | ||||
|         } | ||||
|  | ||||
|         //If no name, and callback is a function, then figure out if it a | ||||
|         //CommonJS thing with dependencies. | ||||
|         if (!deps.length && isFunction(callback)) { | ||||
|         if (!deps && isFunction(callback)) { | ||||
|             deps = []; | ||||
|             //Remove comments from the callback string, | ||||
|             //look for require calls, and pull them into the dependencies, | ||||
|             //but only if there are function args. | ||||
| @@ -1997,4 +2017,4 @@ var requirejs, require, define; | ||||
|  | ||||
|     //Set up with config info. | ||||
|     req(cfg); | ||||
| }(this)); | ||||
| }(this)); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user