renkan: comparison server/python/django/renkanmanager/static/renkanmanager/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/python/django/renkanmanager/static/renkanmanager/lib/requirejs/require.js

changeset 489	7f25a4453865
parent 488	1324bd8747ff
child 495	444b80998255

equal deleted inserted replaced

-:1324bd8747ff
+:7f25a4453865
 /** vim: et:ts=4:sw=4:sts=4
-* @license RequireJS 2.1.15 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
+* @license RequireJS 2.1.18 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.15',
+version = '2.1.18',
 commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
 cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
 jsSuffixRegExp = /\.js$/,
 currDirRegExp = /^\.\//,
 op = Object.prototype,
 // If at the start, or previous value is still ..,
 // keep them so that when converted to a path it may
 // still work when converted to a path, even though
 // as an ID it is less than ideal. In larger point
 // releases, may be better to just kick out an error.
-if (i === 0 || (i == 1 && ary[2] === '..') || ary[i - 1] === '..') {
+if (i === 0 || (i === 1 && ary[2] === '..') || ary[i - 1] === '..') {
 continue;
 } else if (i > 0) {
 ary.splice(i - 1, 2);
 i -= 2;
 }
 } else {
 return (mod.module = {
 id: mod.map.id,
 uri: mod.map.url,
 config: function () {
-return  getOwn(config.config, mod.map.id) || {};
+return getOwn(config.config, mod.map.id) || {};
 },
 exports: mod.exports || (mod.exports = {})
 });
 }
 }
 }
 this.depCount += 1;
 on(depMap, 'defined', bind(this, function (depExports) {
+if (this.undefed) {
+return;
+}
 this.defineDep(i, depExports);
 this.check();
 }));
 if (this.errback) {
 on(depMap, 'error', bind(this, this.errback));
+} else if (this.events.error) {
+// No direct errback on this module, but something
+// else is listening for errors, so be sure to
+// propagate the error correctly.
+on(depMap, 'error', bind(this, function(err) {
+this.emit('error', err);
+}));
 }
 }
 id = depMap.id;
 mod = registry[id];
 //Make sure any remaining defQueue items get properly processed.
 while (defQueue.length) {
 args = defQueue.shift();
 if (args[0] === null) {
-return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' + args[args.length - 1]));
+return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' +
+args[args.length - 1]));
 } else {
 //args are id, deps, factory. Should be normalized by the
 //define() function.
 callGetModule(args);
 }
 //Adjust packages if necessary.
 if (cfg.packages) {
 each(cfg.packages, function (pkgObj) {
 var location, name;
-pkgObj = typeof pkgObj === 'string' ? { name: pkgObj } : pkgObj;
+pkgObj = typeof pkgObj === 'string' ? {name: pkgObj} : pkgObj;
 name = pkgObj.name;
 location = pkgObj.location;
 if (location) {
 config.paths[name] = pkgObj.location;
 eachProp(registry, function (mod, id) {
 //If module already has init called, since it is too
 //late to modify them, and ignore unnormalized ones
 //since they are transient.
 if (!mod.inited && !mod.map.unnormalized) {
-mod.map = makeModuleMap(id);
+mod.map = makeModuleMap(id, null, true);
 }
 });
 //If a deps array or a config callback is specified, then call
 //require with those args. This is useful when require is defined as a
 takeGlobalQueue();
 var map = makeModuleMap(id, relMap, true),
 mod = getOwn(registry, id);
+mod.undefed = true;
 removeScript(id);
 delete defined[id];
 delete urlFetched[map.url];
 delete undefEvents[id];
 //Clean queued defines too. Go backwards
 //in array so that the splices do not
 //mess up the iteration.
 eachReverse(defQueue, function(args, i) {
-if(args[0] === id) {
+if (args[0] === id) {
 defQueue.splice(i, 1);
 }
 });
 if (mod) {
 //Strip off any trailing .js since mainScript is now
 //like a module name.
 mainScript = mainScript.replace(jsSuffixRegExp, '');
 //If mainScript is still a path, fall back to dataMain
 if (req.jsExtRegExp.test(mainScript)) {
 mainScript = dataMain;
 }
 //Put the data-main script in the files to load.
 define.amd = {
 jQuery: true
 };
 /**
 * Executes the text. Normally just uses eval, but can be modified
 * to use a better, environment-specific call. Only used for transpiling
 * loader plugins, not for plain JS modules.
 * @param {String} text the text to execute/evaluate.

renkan