renkan: comparison server/php/basic/public_html/static/lib/requirejs/require.js

Mercurial Mercurial > renkan / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

server/php/basic/public_html/static/lib/requirejs/require.js

changeset 495	444b80998255
parent 489	7f25a4453865
child 598	eb4f4eceada0

equal deleted inserted replaced

-:fd7bfe49155a
+:444b80998255
 /** vim: et:ts=4:sw=4:sts=4
-* @license RequireJS 2.1.18 Copyright (c) 2010-2015, The Dojo Foundation All Rights Reserved.
+* @license RequireJS 2.1.20 Copyright (c) 2010-2015, The Dojo Foundation All Rights Reserved.
 * Available via the MIT or new BSD license.
 * see: http://github.com/jrburke/requirejs for details
 */
 //Not using strict: uneven strict support in browsers, #392, and causes
 //problems with requirejs.exec()/transpiler plugins that may not be strict.
 var requirejs, require, define;
 (function (global) {
 var req, s, head, baseElement, dataMain, src,
 interactiveScript, currentlyAddingScript, mainScript, subPath,
-version = '2.1.18',
+version = '2.1.20',
 commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
 cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
 jsSuffixRegExp = /\.js$/,
 currDirRegExp = /^\.\//,
 op = Object.prototype,
 ostring = op.toString,
 hasOwn = op.hasOwnProperty,
 ap = Array.prototype,
-apsp = ap.splice,
 isBrowser = !!(typeof window !== 'undefined' && typeof navigator !== 'undefined' && window.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
 * defQueue.
 */
 function takeGlobalQueue() {
 //Push all the globalDefQueue items into the context's defQueue
 if (globalDefQueue.length) {
-//Array splice in the values since the context code has a
+each(globalDefQueue, function(queueItem) {
-//local var ref to defQueue, so cannot just reassign the one
+var id = queueItem[0];
-//on context.
+if (typeof id === 'string') {
-apsp.apply(defQueue,
+context.defQueueMap[id] = true;
-[defQueue.length, 0].concat(globalDefQueue));
+}
+defQueue.push(queueItem);
+});
 globalDefQueue = [];
 }
 }
 handlers = {
 depExports = this.depExports,
 exports = this.exports,
 factory = this.factory;
 if (!this.inited) {
-this.fetch();
+// Only fetch if not already in the defQueue.
+if (!hasProp(context.defQueueMap, id)) {
+this.fetch();
+}
 } else if (this.error) {
 this.emit('error', this.error);
 } else if (!this.defining) {
 //The factory could trigger another require call
 //that would result in checking this module to
 //args are id, deps, factory. Should be normalized by the
 //define() function.
 callGetModule(args);
 }
 }
+context.defQueueMap = {};
 }
 context = {
 config: config,
 contextName: contextName,
 registry: registry,
 defined: defined,
 urlFetched: urlFetched,
 defQueue: defQueue,
+defQueueMap: {},
 Module: Module,
 makeModuleMap: makeModuleMap,
 nextTick: req.nextTick,
 onError: onError,
 eachReverse(defQueue, function(args, i) {
 if (args[0] === id) {
 defQueue.splice(i, 1);
 }
 });
+delete context.defQueueMap[id];
 if (mod) {
 //Hold on to listeners in case the
 //module will be attempted to be reloaded
 //using a different config.
 found = true;
 }
 callGetModule(args);
 }
+context.defQueueMap = {};
 //Do this after the cycle of callGetModule in case the result
 //of those calls/init calls changes the registry.
 mod = getOwn(registry, moduleName);
 var config = (context && context.config) || {},
 node;
 if (isBrowser) {
 //In the browser so use a script tag
 node = req.createNode(config, moduleName, url);
+if (config.onNodeCreated) {
+config.onNodeCreated(node, config, moduleName, url);
+}
 node.setAttribute('data-requirecontext', context.contextName);
 node.setAttribute('data-requiremodule', moduleName);
 //Set up load listener. Test attachEvent first because IE9 has
 //This allows multiple modules to be in a file without prematurely
 //tracing dependencies, and allows for anonymous module support,
 //where the module name is not known until the script onload event
 //occurs. If no context, use the global queue, and get it processed
 //in the onscript load callback.
-(context ? context.defQueue : globalDefQueue).push([name, deps, callback]);
+if (context) {
+context.defQueue.push([name, deps, callback]);
+context.defQueueMap[name] = true;
+} else {
+globalDefQueue.push([name, deps, callback]);
+}
 };
 define.amd = {
 jQuery: true
 };

renkan