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 598	eb4f4eceada0
parent 495	444b80998255

equal deleted inserted replaced

-:ebdd1d769158
+:eb4f4eceada0
 /** vim: et:ts=4:sw=4:sts=4
-* @license RequireJS 2.1.20 Copyright (c) 2010-2015, The Dojo Foundation All Rights Reserved.
+* @license RequireJS 2.2.0 Copyright jQuery Foundation and other contributors.
-* Available via the MIT or new BSD license.
+* Released under MIT license, http://github.com/requirejs/requirejs/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.
 /*jslint regexp: true, nomen: true, sloppy: true */
 /*global window, navigator, document, importScripts, setTimeout, opera */
 var requirejs, require, define;
 (function (global) {
 var req, s, head, baseElement, dataMain, src,
 interactiveScript, currentlyAddingScript, mainScript, subPath,
-version = '2.1.20',
+version = '2.2.0',
 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,
 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
 isOpera = typeof opera !== 'undefined' && opera.toString() === '[object Opera]',
 contexts = {},
 cfg = {},
 globalDefQueue = [],
 useInteractive = false;
+//Could match something like ')//comment', do not lose the prefix to comment.
+function commentReplace(match, multi, multiText, singlePrefix) {
+return singlePrefix || '';
+}
 function isFunction(it) {
 return ostring.call(it) === '[object Function]';
 }
 if (this.map.isDefine && !this.ignore) {
 defined[id] = exports;
 if (req.onResourceLoad) {
-req.onResourceLoad(context, this.map, this.depMaps);
+var resLoadMaps = [];
+each(this.depMaps, function (depMap) {
+resLoadMaps.push(depMap.normalizedMap || depMap);
+});
+req.onResourceLoad(context, this.map, resLoadMaps);
 }
 }
 //Clean up
 cleanRegistry(id);
 //for applying map config again either.
 normalizedMap = makeModuleMap(map.prefix + '!' + name,
 this.map.parentMap);
 on(normalizedMap,
 'defined', bind(this, function (value) {
+this.map.normalizedMap = normalizedMap;
 this.init([], function () { return value; }, null, {
 enabled: true,
 ignore: true
 });
 }));
 if (cfg.baseUrl.charAt(cfg.baseUrl.length - 1) !== '/') {
 cfg.baseUrl += '/';
 }
 }
+// Convert old style urlArgs string to a function.
+if (typeof cfg.urlArgs === 'string') {
+var urlArgs = cfg.urlArgs;
+cfg.urlArgs = function(id, url) {
+return (url.indexOf('?') === -1 ? '?' : '&') + urlArgs;
+};
+}
 //Save off the paths since they require special processing,
 //they are additive.
 var shim = config.shim,
 objs = {
 paths: true,
 }
 }
 //Join the path parts together, then figure out if baseUrl is needed.
 url = syms.join('/');
-url += (ext || (/^data\:|\?/.test(url) || skipExt ? '' : '.js'));
+url += (ext || (/^data\:|^blob\:|\?/.test(url) || skipExt ? '' : '.js'));
 url = (url.charAt(0) === '/' || url.match(/^[\w\+\.\-]+:/) ? '' : config.baseUrl) + url;
 }
-return config.urlArgs ? url +
+return config.urlArgs && !/^blob\:/.test(url) ?
-((url.indexOf('?') === -1 ? '?' : '&') +
+url + config.urlArgs(moduleName, url) : url;
-config.urlArgs) : url;
 },
 //Delegates to req.load. Broken out as a separate function to
 //allow overriding in the optimizer.
 load: function (id, url) {
 * Callback for script errors.
 */
 onScriptError: function (evt) {
 var data = getScriptData(evt);
 if (!hasPathFallback(data.id)) {
-return onError(makeError('scripterror', 'Script error for: ' + data.id, evt, [data.id]));
+var parents = [];
+eachProp(registry, function(value, key) {
+if (key.indexOf('_@r') !== 0) {
+each(value.depMaps, function(depMap) {
+if (depMap.id === data.id) {
+parents.push(key);
+return true;
+}
+});
+}
+});
+return onError(makeError('scripterror', 'Script error for "' + data.id +
+(parents.length ?
+'", needed by: ' + parents.join(', ') :
+'"'), evt, [data.id]));
 }
 }
 };
 context.require = context.makeRequire();
 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
 //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
+//read https://github.com/requirejs/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
+//https://github.com/requirejs/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.
 node.addEventListener('load', context.onScriptLoad, false);
 node.addEventListener('error', context.onScriptError, false);
 }
 node.src = url;
+//Calling onNodeCreated after all properties on the node have been
+//set, but before it is placed in the DOM.
+if (config.onNodeCreated) {
+config.onNodeCreated(node, config, moduleName, url);
+}
 //For some cache cases in IE 6-8, the script executes before the end
 //of the appendChild execution, so to tie an anonymous define
 //call to the module name (which is stored on the node), hold on
 //to a reference to this node, but clear after the DOM insertion.
 currentlyAddingScript = node;
 } else if (isWebWorker) {
 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
+//are in play, the expectation is that a build has been done so
-//only one script needs to be loaded anyway. This may need to be
+//that only one script needs to be loaded anyway. This may need
-//reevaluated if other use cases become common.
+//to be reevaluated if other use cases become common.
+// Post a task to the event loop to work around a bug in WebKit
+// where the worker gets garbage-collected after calling
+// importScripts(): https://webkit.org/b/153317
+setTimeout(function() {}, 0);
 importScripts(url);
 //Account for anonymous modules
 context.completeLoad(moduleName);
 } catch (e) {
 dataMain = script.getAttribute('data-main');
 if (dataMain) {
 //Preserve dataMain in case it is a path (i.e. contains '?')
 mainScript = dataMain;
-//Set final baseUrl if there is not already an explicit one.
+//Set final baseUrl if there is not already an explicit one,
-if (!cfg.baseUrl) {
+//but only do so if the data-main value is not a loader plugin
+//module ID.
+if (!cfg.baseUrl && mainScript.indexOf('!') === -1) {
 //Pull off the directory of data-main for use as the
 //baseUrl.
 src = mainScript.split('/');
 mainScript = src.pop();
 subPath = src.length ? src.join('/')  + '/' : './';
 //look for require calls, and pull them into the dependencies,
 //but only if there are function args.
 if (callback.length) {
 callback
 .toString()
-.replace(commentRegExp, '')
+.replace(commentRegExp, commentReplace)
 .replace(cjsRequireRegExp, function (match, dep) {
 deps.push(dep);
 });
 //May be a CommonJS thing even without require calls, but still

renkan