Requirejs and global working

7fd4df74 · Tomas Alabes · d6b6f769 · 7fd4df74 · 7fd4df74 · 7fd4df74
Commit 7fd4df74 authored Jun 01, 2015 by Tomas Alabes
12 changed files
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -16,7 +16,7 @@ module.exports = function(grunt) {
            },
            dist: {
                src: "<%= concat.dist.dest %>",
-                dest: "dev/raphael-min.js"
+                dest: "raphael-min.js"
            }
        },
        replace: {
@@ -39,7 +39,7 @@ module.exports = function(grunt) {
            dist: {
                dest: "<%= pkg.name %>.js",
                src: [
-                    "../node_modules/eve/eve.js",
+                    "node_modules/eve/eve.js",
                    "dev/raphael.core.js",
                    "dev/raphael.svg.js",
                    "dev/raphael.vml.js",

--- a/bower.json
+++ b/bower.json
@@ -5,6 +5,9 @@
  "dependencies": {
    "eve": "git://github.com/adobe-webplatform/eve.git#eef80ed"
  },
+  "devDependencies": {
+    "requirejs": "~2.1.17"
+  },
  "ignore": [
    "eve",
    "**/.*",

--- a/dev/amdDev.js
+++ b/dev/amdDev.js
@@ -8,7 +8,7 @@ require.config({
 require(['raphael'], function(Raphael) {
    var paper = Raphael(0, 0, 640, 720, "container");
-    //paper.circle(100, 100, 100); //example
+    paper.circle(100, 100, 100); //example
    // Work here
 });
--- a/dev/index.js
+++ b/dev/index.js
-var core = require('./raphael.core');
-if(core.svg){
-  require('./raphael.svg');
-}
-if(core.vml){
-  require('./raphael.vml');
-}
-module.exports = core;
\ No newline at end of file
--- a/dev/raphael.amd.js
+++ b/dev/raphael.amd.js
 // ┌────────────────────────────────────────────────────────────────────┐ \\
-// │ Raphaël @VERSION - JavaScript Vector Library                          │ \\
+// │ Raphaël @@VERSION - JavaScript Vector Library                      │ \\
 // ├────────────────────────────────────────────────────────────────────┤ \\
 // │ Copyright © 2008-2012 Dmitry Baranovskiy (http://raphaeljs.com)    │ \\
 // │ Copyright © 2008-2012 Sencha Labs (http://sencha.com)              │ \\
@@ -10,7 +10,7 @@
 (function (glob, factory) {
    if (typeof define === "function" && define.amd) {
        define("raphael", ["raphael.core", "raphael.svg", "raphael.vml"], function(Raphael) {
-            return (glob.Raphael = factory(Raphael));
+            return factory(Raphael);
        });
    } else if (typeof exports === "object") {
        var raphael = require("raphael.core");
@@ -20,7 +20,7 @@
        module.exports = factory(raphael);
    } else {
-        glob.Raphael = factory(glob.Raphael);
+        //glob.Raphael = factory(glob.Raphael);
    }
 }(this, function (Raphael) {
    return Raphael.ninja();

--- a/dev/raphael.core.js
+++ b/dev/raphael.core.js
 // ┌────────────────────────────────────────────────────────────────────┐ \\
-// │ Raphaël @@VERSION - JavaScript Vector Library                          │ \\
+// │ Raphaël @@VERSION - JavaScript Vector Library                      │ \\
 // ├────────────────────────────────────────────────────────────────────┤ \\
-// │ Core Module                                                         │ \\
+// │ Core Module                                                        │ \\
 // ├────────────────────────────────────────────────────────────────────┤ \\
 // │ Licensed under the MIT (http://raphaeljs.com/license.html) license.│ \\
 // └────────────────────────────────────────────────────────────────────┘ \\
@@ -5354,7 +5354,7 @@
     [ method ]
     **
     * If you want to leave no trace of Raphaël (Well, Raphaël creates only one global variable `Raphael`, but anyway.) You can use `ninja` method.
-     * Beware, that in this case plugins could stop working, because they are depending on global variable existance.
+     * Beware, that in this case plugins could stop working, because they are depending on global variable existence.
     **
     = (object) Raphael object
     > Usage

--- a/dev/raphael.svg.js
+++ b/dev/raphael.svg.js
 // ┌─────────────────────────────────────────────────────────────────────┐ \\
-// │ Raphaël @@VERSION - JavaScript Vector Library                                 │ \\
+// │ Raphaël @@VERSION - JavaScript Vector Library                       │ \\
 // ├─────────────────────────────────────────────────────────────────────┤ \\
 // │ SVG Module                                                          │ \\
 // ├─────────────────────────────────────────────────────────────────────┤ \\
@@ -11,7 +11,7 @@
 (function (glob, factory) {
    if (typeof define === "function" && define.amd) {
        define("raphael.svg", ["raphael.core"], function(raphael) {
-            factory(raphael);
+            return factory(raphael);
        });
    } else if (typeof exports === "object") {
        factory(require("raphael.core"));
@@ -657,7 +657,7 @@
         * Element.id
         [ property (number) ]
         **
-         * Unique id of the element. Especially usesful when you want to listen to events of the element,
+         * Unique id of the element. Especially useful when you want to listen to events of the element,
         * because all events are fired in format `<module>.<action>.<id>`. Also useful for @Paper.getById method.
        \*/
        this.id = R._oid++;

--- a/dev/raphael.vml.js
+++ b/dev/raphael.vml.js
 // ┌─────────────────────────────────────────────────────────────────────┐ \\
-// │ Raphaël @@VERSION - JavaScript Vector Library                                 │ \\
+// │ Raphaël @@VERSION - JavaScript Vector Library                       │ \\
 // ├─────────────────────────────────────────────────────────────────────┤ \\
 // │ VML Module                                                          │ \\
 // ├─────────────────────────────────────────────────────────────────────┤ \\
@@ -11,7 +11,7 @@
 (function (glob, factory) {
    if (typeof define === "function" && define.amd) {
        define("raphael.vml", ["raphael.core"], function(raphael) {
-            factory(raphael);
+            return factory(raphael);
        });
    } else if (typeof exports === "object") {
        factory(require("raphael"));

--- a/dev/raphaelTest.html
+++ b/dev/raphaelTest.html
@@ -6,8 +6,7 @@
    <!-- Global use -->
-    <!-- Remember to run to pull the eve submodule -->
+    <!-- To work with full version -->
-    <!-- To work with concatenated version -->
    <!--<script type="text/javascript" src="../raphael.js"></script>-->
    <!-- To work with minified version -->
@@ -15,24 +14,24 @@
    <!-- To work with dev versions -->
    <!-- Comment this 4 script tags if you are testing with AMD -->
-    <script type="text/javascript" src="../eve/eve.js"></script>
+    <!--<script type="text/javascript" src="../node_modules/eve/eve.js"></script>-->
-    <script type="text/javascript" src="raphael.core.js"></script>
+    <!--<script type="text/javascript" src="raphael.core.js"></script>-->
-    <script type="text/javascript" src="raphael.svg.js"></script>
+    <!--<script type="text/javascript" src="raphael.svg.js"></script>-->
-    <script type="text/javascript" src="raphael.vml.js"></script>
+    <!--<script type="text/javascript" src="raphael.vml.js"></script>-->
-    <script type="text/javascript" src="raphael.amd.js"></script>
+    <!--<script type="text/javascript" src="raphael.amd.js"></script>-->
    <!-- Comment this script tag if you are testing with AMD -->
-    <script type="text/javascript">
+    <!--<script type="text/javascript">
        // Initialize container when document is loaded
        window.onload = function () {
            paper = Raphael(0, 0, 640, 720, "container");
-            //paper.circle(100, 100, 100); //example
+            paper.circle(100, 100, 100); //example
        };
        //Work here, in a separate script file or via command line
-    </script>
+    </script>-->
    <!-- AMD use -->
-    <!--<script data-main="amdDev" src="require.js"></script>-->
+    <script data-main="amdDev" src="require.js"></script>
    <!-- Use amdDev.js to work with AMD and Raphael -->
 </head>

--- a/dev/require.js
+++ b/dev/require.js
 /** vim: et:ts=4:sw=4:sts=4
- * @license RequireJS 2.1.8 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
+ * @license RequireJS 2.1.17 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
 */
@@ -12,7 +12,7 @@ var requirejs, require, define;
 (function (global) {
    var req, s, head, baseElement, dataMain, src,
        interactiveScript, currentlyAddingScript, mainScript, subPath,
-        version = '2.1.8',
+        version = '2.1.17',
        commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
        cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
        jsSuffixRegExp = /\.js$/,
@@ -22,7 +22,7 @@ var requirejs, require, define;
        hasOwn = op.hasOwnProperty,
        ap = Array.prototype,
        apsp = ap.splice,
-        isBrowser = !!(typeof window !== 'undefined' && navigator && window.document),
+        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,
@@ -108,7 +108,10 @@ var requirejs, require, define;
        if (source) {
            eachProp(source, function (value, prop) {
                if (force || !hasProp(target, prop)) {
-                    if (deepStringMixin && typeof value !== 'string') {
+                    if (deepStringMixin && typeof value === 'object' && value &&
+                        !isArray(value) && !isFunction(value) &&
+                        !(value instanceof RegExp)) {
                        if (!target[prop]) {
                            target[prop] = {};
                        }
@@ -138,7 +141,7 @@ var requirejs, require, define;
        throw err;
    }
-    //Allow getting a global that expressed in
+    //Allow getting a global that is expressed in
    //dot notation, like 'a.b.c'.
    function getGlobal(value) {
        if (!value) {
@@ -177,7 +180,7 @@ var requirejs, require, define;
    if (typeof requirejs !== 'undefined') {
        if (isFunction(requirejs)) {
-            //Do not overwrite and existing requirejs instance.
+            //Do not overwrite an existing requirejs instance.
            return;
        }
        cfg = requirejs;
@@ -201,6 +204,7 @@ var requirejs, require, define;
                waitSeconds: 7,
                baseUrl: './',
                paths: {},
+                bundles: {},
                pkgs: {},
                shim: {},
                config: {}
@@ -214,6 +218,7 @@ var requirejs, require, define;
            defQueue = [],
            defined = {},
            urlFetched = {},
+            bundlesMap = {},
            requireCounter = 1,
            unnormalizedCounter = 1;
@@ -228,20 +233,19 @@ var requirejs, require, define;
         */
        function trimDots(ary) {
            var i, part;
-            for (i = 0; ary[i]; i += 1) {
+            for (i = 0; i < ary.length; i++) {
                part = ary[i];
                if (part === '.') {
                    ary.splice(i, 1);
                    i -= 1;
                } else if (part === '..') {
-                    if (i === 1 && (ary[2] === '..' || ary[0] === '..')) {
+                    // If at the start, or previous value is still ..,
-                        //End of the line. Keep at least one non-dot
+                    // keep them so that when converted to a path it may
-                        //path segment at the front so it can be mapped
+                    // still work when converted to a path, even though
-                        //correctly to disk. Otherwise, there is likely
+                    // as an ID it is less than ideal. In larger point
-                        //no path mapping for a path starting with '..'.
+                    // releases, may be better to just kick out an error.
-                        //This can still fail, but catches the most reasonable
+                    if (i === 0 || (i === 1 && ary[2] === '..') || ary[i - 1] === '..') {
-                        //uses of ..
+                        continue;
-                        break;
                    } else if (i > 0) {
                        ary.splice(i - 1, 2);
                        i -= 2;
@@ -261,54 +265,45 @@ var requirejs, require, define;
         * @returns {String} normalized name
         */
        function normalize(name, baseName, applyMap) {
-            var pkgName, pkgConfig, mapValue, nameParts, i, j, nameSegment,
+            var pkgMain, mapValue, nameParts, i, j, nameSegment, lastIndex,
-                foundMap, foundI, foundStarMap, starI,
+                foundMap, foundI, foundStarMap, starI, normalizedBaseParts,
-                baseParts = baseName && baseName.split('/'),
+                baseParts = (baseName && baseName.split('/')),
-                normalizedBaseParts = baseParts,
                map = config.map,
                starMap = map && map['*'];
            //Adjust any relative paths.
-            if (name && name.charAt(0) === '.') {
+            if (name) {
-                //If have a base name, try to normalize against it,
+                name = name.split('/');
-                //otherwise, assume it is a top-level require that will
+                lastIndex = name.length - 1;
-                //be relative to baseUrl in the end.
-                if (baseName) {
+                // If wanting node ID compatibility, strip .js from end
-                    if (getOwn(config.pkgs, baseName)) {
+                // of IDs. Have to do this here, and not in nameToUrl
-                        //If the baseName is a package name, then just treat it as one
+                // because node allows either .js or non .js to map
-                        //name to concat the name with.
+                // to same file.
-                        normalizedBaseParts = baseParts = [baseName];
+                if (config.nodeIdCompat && jsSuffixRegExp.test(name[lastIndex])) {
-                    } else {
+                    name[lastIndex] = name[lastIndex].replace(jsSuffixRegExp, '');
-                        //Convert baseName to array, and lop off the last part,
+                }
-                        //so that . matches that 'directory' and not name of the baseName's
-                        //module. For instance, baseName of 'one/two/three', maps to
-                        //'one/two/three.js', but we want the directory, 'one/two' for
-                        //this normalization.
-                        normalizedBaseParts = baseParts.slice(0, baseParts.length - 1);
-                    }
-                    name = normalizedBaseParts.concat(name.split('/'));
-                    trimDots(name);
-                    //Some use of packages may use a . path to reference the
+                // Starts with a '.' so need the baseName
-                    //'main' module name, so normalize for that.
+                if (name[0].charAt(0) === '.' && baseParts) {
-                    pkgConfig = getOwn(config.pkgs, (pkgName = name[0]));
+                    //Convert baseName to array, and lop off the last part,
-                    name = name.join('/');
+                    //so that . matches that 'directory' and not name of the baseName's
-                    if (pkgConfig && name === pkgName + '/' + pkgConfig.main) {
+                    //module. For instance, baseName of 'one/two/three', maps to
-                        name = pkgName;
+                    //'one/two/three.js', but we want the directory, 'one/two' for
-                    }
+                    //this normalization.
-                } else if (name.indexOf('./') === 0) {
+                    normalizedBaseParts = baseParts.slice(0, baseParts.length - 1);
-                    // No baseName, so this is ID is resolved relative
+                    name = normalizedBaseParts.concat(name);
-                    // to baseUrl, pull off the leading dot.
-                    name = name.substring(2);
                }
+                trimDots(name);
+                name = name.join('/');
            }
            //Apply map config if available.
            if (applyMap && map && (baseParts || starMap)) {
                nameParts = name.split('/');
-                for (i = nameParts.length; i > 0; i -= 1) {
+                outerLoop: for (i = nameParts.length; i > 0; i -= 1) {
                    nameSegment = nameParts.slice(0, i).join('/');
                    if (baseParts) {
@@ -325,16 +320,12 @@ var requirejs, require, define;
                                    //Match, update name to the new value.
                                    foundMap = mapValue;
                                    foundI = i;
-                                    break;
+                                    break outerLoop;
                                }
                            }
                        }
                    }
-                    if (foundMap) {
-                        break;
-                    }
                    //Check for a star map match, but just hold on to it,
                    //if there is a shorter segment match later in a matching
                    //config, then favor over this star map.
@@ -355,7 +346,11 @@ var requirejs, require, define;
                }
            }
-            return name;
+            // If the name points to a package's name, use
+            // the package main instead.
+            pkgMain = getOwn(config.pkgs, name);
+            return pkgMain ? pkgMain : name;
        }
        function removeScript(name) {
@@ -373,12 +368,17 @@ var requirejs, require, define;
        function hasPathFallback(id) {
            var pathConfig = getOwn(config.paths, id);
            if (pathConfig && isArray(pathConfig) && pathConfig.length > 1) {
-                removeScript(id);
                //Pop off the first array value, since it failed, and
                //retry
                pathConfig.shift();
                context.require.undef(id);
-                context.require([id]);
+                //Custom require that does not do map translation, since
+                //ID is "absolute", already mapped/resolved.
+                context.makeRequire(null, {
+                    skipMap: true
+                })([id]);
                return true;
            }
        }
@@ -444,7 +444,16 @@ var requirejs, require, define;
                            return normalize(name, parentName, applyMap);
                        });
                    } else {
-                        normalizedName = normalize(name, parentName, applyMap);
+                        // If nested plugin references, then do not try to
+                        // normalize, as it will not normalize correctly. This
+                        // places a restriction on resourceIds, and the longer
+                        // term solution is not to normalize until plugins are
+                        // loaded and all normalizations to allow for async
+                        // loading of a loader plugin. But for now, fixes the
+                        // common uses. Details in #1131
+                        normalizedName = name.indexOf('!') === -1 ?
+                                         normalize(name, parentName, applyMap) :
+                                         name;
                    }
                } else {
                    //A regular module.
@@ -549,7 +558,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, 0].concat(globalDefQueue));
                globalDefQueue = [];
            }
        }
@@ -566,7 +575,7 @@ var requirejs, require, define;
                mod.usingExports = true;
                if (mod.map.isDefine) {
                    if (mod.exports) {
-                        return mod.exports;
+                        return (defined[mod.map.id] = mod.exports);
                    } else {
                        return (mod.exports = defined[mod.map.id] = {});
                    }
@@ -580,15 +589,9 @@ var requirejs, require, define;
                        id: mod.map.id,
                        uri: mod.map.url,
                        config: function () {
-                            var c,
+                            return  getOwn(config.config, mod.map.id) || {};
-                                pkg = getOwn(config.pkgs, mod.map.id);
-                            // For packages, only support config targeted
-                            // at the main module.
-                            c = pkg ? getOwn(config.config, mod.map.id + '/' + pkg.main) :
-                                      getOwn(config.config, mod.map.id);
-                            return  c || {};
                        },
-                        exports: defined[mod.map.id]
+                        exports: mod.exports || (mod.exports = {})
                    });
                }
            }
@@ -629,7 +632,7 @@ var requirejs, require, define;
        }
        function checkLoaded() {
-            var map, modId, err, usingPathFallback,
+            var err, usingPathFallback,
                waitInterval = config.waitSeconds * 1000,
                //It is possible to disable the wait interval by using waitSeconds of 0.
                expired = waitInterval && (context.startTime + waitInterval) < new Date().getTime(),
@@ -647,8 +650,8 @@ var requirejs, require, define;
            //Figure out the state of all the modules.
            eachProp(enabledRegistry, function (mod) {
-                map = mod.map;
+                var map = mod.map,
-                modId = map.id;
+                    modId = map.id;
                //Skip things that are not enabled or in error state.
                if (!mod.enabled) {
@@ -871,17 +874,14 @@ var requirejs, require, define;
                                exports = context.execCb(id, factory, depExports, exports);
                            }
-                            if (this.map.isDefine) {
+                            // Favor return value over exports. If node/cjs in play,
-                                //If setting exports via 'module' is in play,
+                            // then will not have a return value anyway. Favor
-                                //favor that over return value and exports. After that,
+                            // module.exports assignment over exports object.
-                                //favor a non-undefined return value over exports use.
+                            if (this.map.isDefine && exports === undefined) {
                                cjsModule = this.module;
-                                if (cjsModule &&
+                                if (cjsModule) {
-                                        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) {
+                                } else if (this.usingExports) {
                                    //exports already set the defined value.
                                    exports = this.exports;
                                }
@@ -941,6 +941,7 @@ var requirejs, require, define;
                on(pluginMap, 'defined', bind(this, function (plugin) {
                    var load, normalizedMap, normalizedMod,
+                        bundleId = getOwn(bundlesMap, this.map.id),
                        name = this.map.name,
                        parentName = this.map.parentMap ? this.map.parentMap.name : null,
                        localRequire = context.makeRequire(map.parentMap, {
@@ -986,6 +987,14 @@ var requirejs, require, define;
                        return;
                    }
+                    //If a paths config, then just load that file instead to
+                    //resolve the plugin, as it is built into that paths layer.
+                    if (bundleId) {
+                        this.map.url = context.nameToUrl(bundleId);
+                        this.load();
+                        return;
+                    }
                    load = bind(this, function (value) {
                        this.init([], function () { return value; }, null, {
                            enabled: true
@@ -1114,6 +1123,13 @@ var requirejs, require, define;
                        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);
+                            }));
                        }
                    }
@@ -1250,31 +1266,38 @@ var requirejs, require, define;
                    }
                }
-                //Save off the paths and packages since they require special processing,
+                //Save off the paths since they require special processing,
                //they are additive.
-                var pkgs = config.pkgs,
+                var shim = config.shim,
-                    shim = config.shim,
                    objs = {
                        paths: true,
+                        bundles: true,
                        config: true,
                        map: true
                    };
                eachProp(cfg, function (value, prop) {
                    if (objs[prop]) {
-                        if (prop === 'map') {
+                        if (!config[prop]) {
-                            if (!config.map) {
+                            config[prop] = {};
-                                config.map = {};
-                            }
-                            mixin(config[prop], value, true, true);
-                        } else {
-                            mixin(config[prop], value, true);
                        }
+                        mixin(config[prop], value, true, true);
                    } else {
                        config[prop] = value;
                    }
                });
+                //Reverse map the bundles
+                if (cfg.bundles) {
+                    eachProp(cfg.bundles, function (value, prop) {
+                        each(value, function (v) {
+                            if (v !== prop) {
+                                bundlesMap[v] = prop;
+                            }
+                        });
+                    });
+                }
                //Merge shim
                if (cfg.shim) {
                    eachProp(cfg.shim, function (value, id) {
@@ -1295,29 +1318,25 @@ var requirejs, require, define;
                //Adjust packages if necessary.
                if (cfg.packages) {
                    each(cfg.packages, function (pkgObj) {
-                        var location;
+                        var location, name;
                        pkgObj = typeof pkgObj === 'string' ? { name: pkgObj } : pkgObj;
+                        name = pkgObj.name;
                        location = pkgObj.location;
+                        if (location) {
+                            config.paths[name] = pkgObj.location;
+                        }
-                        //Create a brand new object on pkgs, since currentPackages can
+                        //Save pointer to main module ID for pkg name.
-                        //be passed in again, and config.pkgs is the internal transformed
+                        //Remove leading dot in main, so main paths are normalized,
-                        //state for all package configs.
+                        //and remove any trailing .js, since different package
-                        pkgs[pkgObj.name] = {
+                        //envs have different conventions: some use a module name,
-                            name: pkgObj.name,
+                        //some use a file name.
-                            location: location || pkgObj.name,
+                        config.pkgs[name] = pkgObj.name + '/' + (pkgObj.main || 'main')
-                            //Remove leading dot in main, so main paths are normalized,
+                                     .replace(currDirRegExp, '')
-                            //and remove any trailing .js, since different package
+                                     .replace(jsSuffixRegExp, '');
-                            //envs have different conventions: some use a module name,
-                            //some use a file name.
-                            main: (pkgObj.main || 'main')
-                                  .replace(currDirRegExp, '')
-                                  .replace(jsSuffixRegExp, '')
-                        };
                    });
-                    //Done with modifications, assing packages back to context config
-                    config.pkgs = pkgs;
                }
                //If there are any "waiting to execute" modules in the registry,
@@ -1464,10 +1483,21 @@ var requirejs, require, define;
                        var map = makeModuleMap(id, relMap, true),
                            mod = getOwn(registry, id);
+                        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) {
+                                defQueue.splice(i, 1);
+                            }
+                        });
                        if (mod) {
                            //Hold on to listeners in case the
                            //module will be attempted to be reloaded
@@ -1487,7 +1517,7 @@ var requirejs, require, define;
            /**
             * Called to enable a module if it is still in the registry
             * awaiting enablement. A second arg, parent, the parent module,
-             * is passed in for context, when this method is overriden by
+             * is passed in for context, when this method is overridden by
             * the optimizer. Not shown here to keep code compact.
             */
            enable: function (depMap) {
@@ -1561,8 +1591,19 @@ var requirejs, require, define;
             * internal API, not a public one. Use toUrl for the public API.
             */
            nameToUrl: function (moduleName, ext, skipExt) {
-                var paths, pkgs, pkg, pkgPath, syms, i, parentModule, url,
+                var paths, syms, i, parentModule, url,
-                    parentPath;
+                    parentPath, bundleId,
+                    pkgMain = getOwn(config.pkgs, moduleName);
+                if (pkgMain) {
+                    moduleName = pkgMain;
+                }
+                bundleId = getOwn(bundlesMap, moduleName);
+                if (bundleId) {
+                    return context.nameToUrl(bundleId, ext, skipExt);
+                }
                //If a colon is in the URL, it indicates a protocol is used and it is just
                //an URL to a file, or if it starts with a slash, contains a query arg (i.e. ?)
@@ -1576,7 +1617,6 @@ var requirejs, require, define;
                } else {
                    //A module that needs to be converted to a path.
                    paths = config.paths;
-                    pkgs = config.pkgs;
                    syms = moduleName.split('/');
                    //For each module name segment, see if there is a path
@@ -1584,7 +1624,7 @@ var requirejs, require, define;
                    //and work up from it.
                    for (i = syms.length; i > 0; i -= 1) {
                        parentModule = syms.slice(0, i).join('/');
-                        pkg = getOwn(pkgs, parentModule);
                        parentPath = getOwn(paths, parentModule);
                        if (parentPath) {
                            //If an array, it means there are a few choices,
@@ -1594,22 +1634,12 @@ var requirejs, require, define;
                            }
                            syms.splice(0, i, parentPath);
                            break;
-                        } else if (pkg) {
-                            //If module name is just the package name, then looking
-                            //for the main module.
-                            if (moduleName === pkg.name) {
-                                pkgPath = pkg.location + '/' + pkg.main;
-                            } else {
-                                pkgPath = pkg.location;
-                            }
-                            syms.splice(0, i, pkgPath);
-                            break;
                        }
                    }
                    //Join the path parts together, then figure out if baseUrl is needed.
                    url = syms.join('/');
-                    url += (ext || (/\?/.test(url) || skipExt ? '' : '.js'));
+                    url += (ext || (/^data\:|\?/.test(url) || skipExt ? '' : '.js'));
                    url = (url.charAt(0) === '/' || url.match(/^[\w\+\.\-]+:/) ? '' : config.baseUrl) + url;
                }
@@ -1918,7 +1948,7 @@ var requirejs, require, define;
    }
    //Look for a data-main script attribute, which could also adjust the baseUrl.
-    if (isBrowser) {
+    if (isBrowser && !cfg.skipDataMain) {
        //Figure out baseUrl. Get it from the script tag with require.js in it.
        eachReverse(scripts(), function (script) {
            //Set the 'head' where we can append children by

--- a/raphael-min.js
+++ b/raphael-min.js
--- a/raphael.js
+++ b/raphael.js
-// ┌────────────────────────────────────────────────────────────────────┐ \\
-// │ Raphaël 2.1.4 - JavaScript Vector Library                          │ \\
-// ├────────────────────────────────────────────────────────────────────┤ \\
-// │ Copyright © 2008-2012 Dmitry Baranovskiy (http://raphaeljs.com)    │ \\
-// │ Copyright © 2008-2012 Sencha Labs (http://sencha.com)              │ \\
-// ├────────────────────────────────────────────────────────────────────┤ \\
-// │ Licensed under the MIT (http://raphaeljs.com/license.html) license.│ \\
-// └────────────────────────────────────────────────────────────────────┘ \\
 // Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved.
 // 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -377,27 +369,26 @@
    };
    (typeof module != "undefined" && module.exports) ? (module.exports = eve) : (typeof define != "undefined" ? (define("eve", [], function() { return eve; })) : (glob.eve = eve));
 })(this);
-// ┌─────────────────────────────────────────────────────────────────────┐ \\
-// │ "Raphaël 2.1.2" - JavaScript Vector Library                         │ \\
+// ┌────────────────────────────────────────────────────────────────────┐ \\
-// ├─────────────────────────────────────────────────────────────────────┤ \\
+// │ Raphaël 2.1.4 - JavaScript Vector Library                      │ \\
-// │ Copyright (c) 2008-2011 Dmitry Baranovskiy (http://raphaeljs.com)   │ \\
+// ├────────────────────────────────────────────────────────────────────┤ \\
-// │ Copyright (c) 2008-2011 Sencha Labs (http://sencha.com)             │ \\
+// │ Core Module                                                        │ \\
-// │ Licensed under the MIT (http://raphaeljs.com/license.html) license. │ \\
+// ├────────────────────────────────────────────────────────────────────┤ \\
-// └─────────────────────────────────────────────────────────────────────┘ \\
+// │ Licensed under the MIT (http://raphaeljs.com/license.html) license.│ \\
+// └────────────────────────────────────────────────────────────────────┘ \\
 (function (glob, factory) {
-    // AMD support
    if (typeof define === "function" && define.amd) {
-        // Define as an anonymous module
+        define("raphael.core", ["eve"], function(eve) {
-        define(["eve"], function( eve ) {
+            return factory(eve);
-            return factory(glob, eve);
        });
+    } else if (typeof exports === "object") {
+        module.exports = factory(require("eve"));
    } else {
-        // Browser globals (glob is window)
+        glob.Raphael = factory(glob.eve);
-        // Raphael adds itself to window
-        factory(glob, glob.eve || (typeof require == "function" && require('eve')) );
    }
-}(this, function (window, eve) {
+}(this, function (eve) {
    /*\
     * Raphael
     [ method ]
@@ -465,7 +456,7 @@
            }
        }
    }
-    R.version = "2.1.2";
+    R.version = "2.1.4";
    R.eve = eve;
    var loaded,
        separator = /[, ]+/,
@@ -5735,7 +5726,7 @@
     [ method ]
     **
     * If you want to leave no trace of Raphaël (Well, Raphaël creates only one global variable `Raphael`, but anyway.) You can use `ninja` method.
-     * Beware, that in this case plugins could stop working, because they are depending on global variable existance.
+     * Beware, that in this case plugins could stop working, because they are depending on global variable existence.
     **
     = (object) Raphael object
     > Usage
@@ -5789,8 +5780,11 @@
        isLoaded();
    })(document, "DOMContentLoaded");
+    return R;
+}));
 // ┌─────────────────────────────────────────────────────────────────────┐ \\
-// │ Raphaël - JavaScript Vector Library                                 │ \\
+// │ Raphaël 2.1.4 - JavaScript Vector Library                       │ \\
 // ├─────────────────────────────────────────────────────────────────────┤ \\
 // │ SVG Module                                                          │ \\
 // ├─────────────────────────────────────────────────────────────────────┤ \\
@@ -5799,10 +5793,21 @@
 // │ Licensed under the MIT (http://raphaeljs.com/license.html) license. │ \\
 // └─────────────────────────────────────────────────────────────────────┘ \\
-(function(){
+(function (glob, factory) {
-    if (!R.svg) {
+    if (typeof define === "function" && define.amd) {
+        define("raphael.svg", ["raphael.core"], function(raphael) {
+            return factory(raphael);
+        });
+    } else if (typeof exports === "object") {
+        factory(require("raphael.core"));
+    } else {
+        factory(glob.Raphael);
+    }
+}(this, function(R) {
+    if (R && !R.svg) {
        return;
    }
    var has = "hasOwnProperty",
        Str = String,
        toFloat = parseFloat,
@@ -7194,10 +7199,10 @@
            };
        })(method);
    }
-})();
+}));
 // ┌─────────────────────────────────────────────────────────────────────┐ \\
-// │ Raphaël - JavaScript Vector Library                                 │ \\
+// │ Raphaël 2.1.4 - JavaScript Vector Library                       │ \\
 // ├─────────────────────────────────────────────────────────────────────┤ \\
 // │ VML Module                                                          │ \\
 // ├─────────────────────────────────────────────────────────────────────┤ \\
@@ -7206,10 +7211,21 @@
 // │ Licensed under the MIT (http://raphaeljs.com/license.html) license. │ \\
 // └─────────────────────────────────────────────────────────────────────┘ \\
-(function(){
+(function (glob, factory) {
-    if (!R.vml) {
+    if (typeof define === "function" && define.amd) {
+        define("raphael.vml", ["raphael.core"], function(raphael) {
+            return factory(raphael);
+        });
+    } else if (typeof exports === "object") {
+        factory(require("raphael"));
+    } else {
+        factory(glob.Raphael);
+    }
+}(this, function(R) {
+    if (R && !R.vml) {
        return;
    }
    var has = "hasOwnProperty",
        Str = String,
        toFloat = parseFloat,
@@ -7425,7 +7441,7 @@
        if ("arrow-end" in params) {
            addArrow(res, params["arrow-end"], 1);
        }
-        if (params.opacity != null || 
+        if (params.opacity != null ||
            params["stroke-width"] != null ||
            params.fill != null ||
            params.src != null ||
@@ -7504,7 +7520,7 @@
            params["stroke-width"] && (stroke.weight = width);
            width && width < 1 && (opacity *= width) && (stroke.weight = 1);
            stroke.opacity = opacity;
            params["stroke-linejoin"] && (stroke.joinstyle = params["stroke-linejoin"] || "miter");
            stroke.miterlimit = params["stroke-miterlimit"] || 8;
            params["stroke-linecap"] && (stroke.endcap = params["stroke-linecap"] == "butt" ? "flat" : params["stroke-linecap"] == "square" ? "square" : "round");
@@ -7551,7 +7567,7 @@
                res._.dirty = 1;
                break;
            }
            // text-anchor emulation
            switch (a["text-anchor"]) {
                case "start":
@@ -7764,7 +7780,7 @@
        }
        cx = cx == null ? bbox.x + bbox.width / 2 : cx;
        cy = cy == null ? bbox.y + bbox.height / 2 : cy;
        this.transform(this._.transform.concat([["s", sx, sy, cx, cy]]));
        this._.dirtyT = 1;
        return this;
@@ -8204,15 +8220,32 @@
            };
        })(method);
    }
-})();
+}));
-    // EXPOSE
+// ┌────────────────────────────────────────────────────────────────────┐ \\
-    // SVG and VML are appended just before the EXPOSE line
+// │ Raphaël 2.1.4 - JavaScript Vector Library                      │ \\
-    // Even with AMD, Raphael should be defined globally
+// ├────────────────────────────────────────────────────────────────────┤ \\
-    oldRaphael.was ? (g.win.Raphael = R) : (Raphael = R);
+// │ Copyright © 2008-2012 Dmitry Baranovskiy (http://raphaeljs.com)    │ \\
+// │ Copyright © 2008-2012 Sencha Labs (http://sencha.com)              │ \\
+// ├────────────────────────────────────────────────────────────────────┤ \\
+// │ Licensed under the MIT (http://raphaeljs.com/license.html) license.│ \\
+// └────────────────────────────────────────────────────────────────────┘ \\
-    if(typeof exports == "object"){
+(function (glob, factory) {
-        module.exports = R;
+    if (typeof define === "function" && define.amd) {
+        define("raphael", ["raphael.core", "raphael.svg", "raphael.vml"], function(Raphael) {
+            return factory(Raphael);
+        });
+    } else if (typeof exports === "object") {
+        var raphael = require("raphael.core");
+        require("raphael.svg");
+        require("raphael.vml");
+        module.exports = factory(raphael);
+    } else {
+        //glob.Raphael = factory(glob.Raphael);
    }
-    return R;
+}(this, function (Raphael) {
-}));
+    return Raphael.ninja();
+}));
\ No newline at end of file