requirejs-rails 0.9.2 → 0.9.3

data/lib/requirejs/rails/engine.rb

@@ -20,6 +20,15 @@ module Requirejs
 
         config.assets.precompile += config.requirejs.precompile
 
+        # Check for the existence of the requirejs:precompile:all top-level Rake task and disable asset pipeline
+        # compression to ensure that `r.js` gets uncompressed assets.
+        Rake.application.top_level_tasks.each do |task_name|
+          case task_name
+            when "requirejs:precompile:all"
+              config.assets.js_compressor = false
+          end
+        end if defined?(Rake.application)
+
         manifest_directory = config.assets.manifest || File.join(::Rails.public_path, config.assets.prefix)
         manifest_path = File.join(manifest_directory, "rjs_manifest.yml")
         config.requirejs.manifest_path = Pathname.new(manifest_path)

data/lib/requirejs/rails/rjs_driver.js.erb

@@ -35,11 +35,10 @@ var errback = function(error) {
 // Do a series of builds of individual files, using the args suggested by:
 // http://requirejs.org/docs/optimization.html#onejs
 //
-// r.js will eventually need a nested call idiom to handle async 
+// r.js will eventually need a nested call idiom to handle async
 // builds.  Anticipating that need.
 var async_runner = module_specs.reduceRight(function(prev, curr) {
   return function (buildReportText) {
-    requirejs.optimize(mix(curr), prev);
     requirejs.optimize(mix(curr), prev, errback);
   };
 }, function(buildReportText) {} );

data/lib/requirejs/rails/version.rb

@@ -1,6 +1,6 @@
 module Requirejs
   module Rails
-    Version = "0.9.2"
-    LibVersion = "2.1.10"
+    Version = "0.9.3"
+    LibVersion = "2.1.11"
   end
 end

data/lib/tasks/requirejs-rails_tasks.rake

@@ -11,7 +11,7 @@ require 'active_support/ordered_options'
 
 namespace :requirejs do
   # This method was backported from an earlier version of Sprockets.
-  def ruby_rake_task(task)
+  def ruby_rake_task(task, force = true)
     env = ENV["RAILS_ENV"] || "production"
     groups = ENV["RAILS_GROUPS"] || "assets"
     args = [$0, task, "RAILS_ENV=#{env}", "RAILS_GROUPS=#{groups}"]
@@ -77,19 +77,6 @@ OS X Homebrew users can use 'brew install node'.
                   "requirejs:precompile:run_rjs",
                   "requirejs:precompile:digestify_and_compress"]
 
-    task :disable_js_compressor do
-      # Ensure that Sprockets doesn't try to compress assets before they hit
-      # r.js.  Failure to do this can cause a build which works in dev, but
-      # emits require.js "notloaded" errors, etc. in production.
-      #
-      # Note that a configuration block is used here to ensure that it runs
-      # after the environment ("config/application.rb",
-      # "config/environments/*.rb") has been set up.
-      Rails.application.config.assets.configure do |env|
-        env.js_compressor = nil
-      end
-    end
-
     # Invoke another ruby process if we're called from inside
     # assets:precompile so we don't clobber the environment
     #
@@ -160,6 +147,3 @@ OS X Homebrew users can use 'brew install node'.
 end
 
 task "assets:precompile" => ["requirejs:precompile:external"]
-if ARGV[0] == "requirejs:precompile:all"
-  task "assets:environment" => ["requirejs:precompile:disable_js_compressor"]
-end

data/requirejs-rails.gemspec

@@ -16,10 +16,10 @@ Gem::Specification.new do |s|
   git_test_files, git_files = `git ls-files`.split("\n").partition { |f| f =~ /^test/ }
   s.test_files = git_test_files
   s.files = git_files
-  s.require_path = 'lib'  
+  s.require_path = 'lib'
 
-  s.add_dependency "railties", ">= 3.1.1", "< 4.1"
-  s.add_development_dependency "rails", ">= 3.1.1", "< 4.1"
+  s.add_dependency "railties", ">= 3.1.1"
+  s.add_development_dependency "rails", ">= 3.1.1"
   s.add_development_dependency "sqlite3"
 
   s.requirements << "node.js is required for 'rake assets:precompile', used to run the r.js build"

data/vendor/assets/javascripts/almond.js

@@ -1,5 +1,5 @@
 /**
- * almond 0.2.5 Copyright (c) 2011-2012, The Dojo Foundation All Rights Reserved.
+ * @license almond 0.2.9 Copyright (c) 2011-2014, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/almond for details
  */
@@ -10,396 +10,412 @@
 
 var requirejs, require, define;
 (function (undef) {
-  var main, req, makeMap, handlers,
-      defined = {},
-      waiting = {},
-      config = {},
-      defining = {},
-      hasOwn = Object.prototype.hasOwnProperty,
-      aps = [].slice;
-
-  function hasProp(obj, prop) {
-    return hasOwn.call(obj, prop);
-  }
-
-  /**
-   * Given a relative module name, like ./something, normalize it to
-   * a real name that can be mapped to a path.
-   * @param {String} name the relative name
-   * @param {String} baseName a real name that the name arg is relative
-   * to.
-   * @returns {String} normalized name
-   */
-  function normalize(name, baseName) {
-    var nameParts, nameSegment, mapValue, foundMap,
-        foundI, foundStarMap, starI, i, j, part,
-        baseParts = baseName && baseName.split("/"),
-        map = config.map,
-        starMap = (map && map['*']) || {};
-
-    //Adjust any relative paths.
-    if (name && name.charAt(0) === ".") {
-      //If have a base name, try to normalize against it,
-      //otherwise, assume it is a top-level require that will
-      //be relative to baseUrl in the end.
-      if (baseName) {
-        //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.
-        baseParts = baseParts.slice(0, baseParts.length - 1);
-
-        name = baseParts.concat(name.split("/"));
-
-        //start trimDots
-        for (i = 0; i < name.length; i += 1) {
-          part = name[i];
-          if (part === ".") {
-            name.splice(i, 1);
-            i -= 1;
-          } else if (part === "..") {
-            if (i === 1 && (name[2] === '..' || name[0] === '..')) {
-              //End of the line. Keep at least one non-dot
-              //path segment at the front so it can be mapped
-              //correctly to disk. Otherwise, there is likely
-              //no path mapping for a path starting with '..'.
-              //This can still fail, but catches the most reasonable
-              //uses of ..
-              break;
-            } else if (i > 0) {
-              name.splice(i - 1, 2);
-              i -= 2;
-            }
-          }
-        }
-        //end trimDots
-
-        name = name.join("/");
-      } else if (name.indexOf('./') === 0) {
-        // No baseName, so this is ID is resolved relative
-        // to baseUrl, pull off the leading dot.
-        name = name.substring(2);
-      }
+    var main, req, makeMap, handlers,
+        defined = {},
+        waiting = {},
+        config = {},
+        defining = {},
+        hasOwn = Object.prototype.hasOwnProperty,
+        aps = [].slice,
+        jsSuffixRegExp = /\.js$/;
+
+    function hasProp(obj, prop) {
+        return hasOwn.call(obj, prop);
     }
 
-    //Apply map config if available.
-    if ((baseParts || starMap) && map) {
-      nameParts = name.split('/');
-
-      for (i = nameParts.length; i > 0; i -= 1) {
-        nameSegment = nameParts.slice(0, i).join("/");
-
-        if (baseParts) {
-          //Find the longest baseName segment match in the config.
-          //So, do joins on the biggest to smallest lengths of baseParts.
-          for (j = baseParts.length; j > 0; j -= 1) {
-            mapValue = map[baseParts.slice(0, j).join('/')];
-
-            //baseName segment has  config, find if it has one for
-            //this name.
-            if (mapValue) {
-              mapValue = mapValue[nameSegment];
-              if (mapValue) {
-                //Match, update name to the new value.
-                foundMap = mapValue;
-                foundI = i;
-                break;
-              }
+    /**
+     * Given a relative module name, like ./something, normalize it to
+     * a real name that can be mapped to a path.
+     * @param {String} name the relative name
+     * @param {String} baseName a real name that the name arg is relative
+     * to.
+     * @returns {String} normalized name
+     */
+    function normalize(name, baseName) {
+        var nameParts, nameSegment, mapValue, foundMap, lastIndex,
+            foundI, foundStarMap, starI, i, j, part,
+            baseParts = baseName && baseName.split("/"),
+            map = config.map,
+            starMap = (map && map['*']) || {};
+
+        //Adjust any relative paths.
+        if (name && name.charAt(0) === ".") {
+            //If have a base name, try to normalize against it,
+            //otherwise, assume it is a top-level require that will
+            //be relative to baseUrl in the end.
+            if (baseName) {
+                //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.
+                baseParts = baseParts.slice(0, baseParts.length - 1);
+                name = name.split('/');
+                lastIndex = name.length - 1;
+
+                // Node .js allowance:
+                if (config.nodeIdCompat && jsSuffixRegExp.test(name[lastIndex])) {
+                    name[lastIndex] = name[lastIndex].replace(jsSuffixRegExp, '');
+                }
+
+                name = baseParts.concat(name);
+
+                //start trimDots
+                for (i = 0; i < name.length; i += 1) {
+                    part = name[i];
+                    if (part === ".") {
+                        name.splice(i, 1);
+                        i -= 1;
+                    } else if (part === "..") {
+                        if (i === 1 && (name[2] === '..' || name[0] === '..')) {
+                            //End of the line. Keep at least one non-dot
+                            //path segment at the front so it can be mapped
+                            //correctly to disk. Otherwise, there is likely
+                            //no path mapping for a path starting with '..'.
+                            //This can still fail, but catches the most reasonable
+                            //uses of ..
+                            break;
+                        } else if (i > 0) {
+                            name.splice(i - 1, 2);
+                            i -= 2;
+                        }
+                    }
+                }
+                //end trimDots
+
+                name = name.join("/");
+            } else if (name.indexOf('./') === 0) {
+                // No baseName, so this is ID is resolved relative
+                // to baseUrl, pull off the leading dot.
+                name = name.substring(2);
             }
-          }
         }
 
-        if (foundMap) {
-          break;
-        }
+        //Apply map config if available.
+        if ((baseParts || starMap) && map) {
+            nameParts = name.split('/');
+
+            for (i = nameParts.length; i > 0; i -= 1) {
+                nameSegment = nameParts.slice(0, i).join("/");
+
+                if (baseParts) {
+                    //Find the longest baseName segment match in the config.
+                    //So, do joins on the biggest to smallest lengths of baseParts.
+                    for (j = baseParts.length; j > 0; j -= 1) {
+                        mapValue = map[baseParts.slice(0, j).join('/')];
+
+                        //baseName segment has  config, find if it has one for
+                        //this name.
+                        if (mapValue) {
+                            mapValue = mapValue[nameSegment];
+                            if (mapValue) {
+                                //Match, update name to the new value.
+                                foundMap = mapValue;
+                                foundI = i;
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                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.
+                if (!foundStarMap && starMap && starMap[nameSegment]) {
+                    foundStarMap = starMap[nameSegment];
+                    starI = i;
+                }
+            }
 
-        //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.
-        if (!foundStarMap && starMap && starMap[nameSegment]) {
-          foundStarMap = starMap[nameSegment];
-          starI = i;
+            if (!foundMap && foundStarMap) {
+                foundMap = foundStarMap;
+                foundI = starI;
+            }
+
+            if (foundMap) {
+                nameParts.splice(0, foundI, foundMap);
+                name = nameParts.join('/');
+            }
         }
-      }
 
-      if (!foundMap && foundStarMap) {
-        foundMap = foundStarMap;
-        foundI = starI;
-      }
+        return name;
+    }
 
-      if (foundMap) {
-        nameParts.splice(0, foundI, foundMap);
-        name = nameParts.join('/');
-      }
+    function makeRequire(relName, forceSync) {
+        return function () {
+            //A version of a require function that passes a moduleName
+            //value for items that may need to
+            //look up paths relative to the moduleName
+            return req.apply(undef, aps.call(arguments, 0).concat([relName, forceSync]));
+        };
     }
 
-    return name;
-  }
+    function makeNormalize(relName) {
+        return function (name) {
+            return normalize(name, relName);
+        };
+    }
 
-  function makeRequire(relName, forceSync) {
-    return function () {
-      //A version of a require function that passes a moduleName
-      //value for items that may need to
-      //look up paths relative to the moduleName
-      return req.apply(undef, aps.call(arguments, 0).concat([relName, forceSync]));
-    };
-  }
+    function makeLoad(depName) {
+        return function (value) {
+            defined[depName] = value;
+        };
+    }
 
-  function makeNormalize(relName) {
-    return function (name) {
-      return normalize(name, relName);
-    };
-  }
+    function callDep(name) {
+        if (hasProp(waiting, name)) {
+            var args = waiting[name];
+            delete waiting[name];
+            defining[name] = true;
+            main.apply(undef, args);
+        }
 
-  function makeLoad(depName) {
-    return function (value) {
-      defined[depName] = value;
-    };
-  }
-
-  function callDep(name) {
-    if (hasProp(waiting, name)) {
-      var args = waiting[name];
-      delete waiting[name];
-      defining[name] = true;
-      main.apply(undef, args);
+        if (!hasProp(defined, name) && !hasProp(defining, name)) {
+            throw new Error('No ' + name);
+        }
+        return defined[name];
     }
 
-    if (!hasProp(defined, name) && !hasProp(defining, name)) {
-      throw new Error('No ' + name);
-    }
-    return defined[name];
-  }
-
-  //Turns a plugin!resource to [plugin, resource]
-  //with the plugin being undefined if the name
-  //did not have a plugin prefix.
-  function splitPrefix(name) {
-    var prefix,
-        index = name ? name.indexOf('!') : -1;
-    if (index > -1) {
-      prefix = name.substring(0, index);
-      name = name.substring(index + 1, name.length);
-    }
-    return [prefix, name];
-  }
-
-  /**
-   * Makes a name map, normalizing the name, and using a plugin
-   * for normalization if necessary. Grabs a ref to plugin
-   * too, as an optimization.
-   */
-  makeMap = function (name, relName) {
-    var plugin,
-        parts = splitPrefix(name),
-        prefix = parts[0];
-
-    name = parts[1];
-
-    if (prefix) {
-      prefix = normalize(prefix, relName);
-      plugin = callDep(prefix);
+    //Turns a plugin!resource to [plugin, resource]
+    //with the plugin being undefined if the name
+    //did not have a plugin prefix.
+    function splitPrefix(name) {
+        var prefix,
+            index = name ? name.indexOf('!') : -1;
+        if (index > -1) {
+            prefix = name.substring(0, index);
+            name = name.substring(index + 1, name.length);
+        }
+        return [prefix, name];
     }
 
-    //Normalize according
-    if (prefix) {
-      if (plugin && plugin.normalize) {
-        name = plugin.normalize(name, makeNormalize(relName));
-      } else {
-        name = normalize(name, relName);
-      }
-    } else {
-      name = normalize(name, relName);
-      parts = splitPrefix(name);
-      prefix = parts[0];
-      name = parts[1];
-      if (prefix) {
-        plugin = callDep(prefix);
-      }
+    /**
+     * Makes a name map, normalizing the name, and using a plugin
+     * for normalization if necessary. Grabs a ref to plugin
+     * too, as an optimization.
+     */
+    makeMap = function (name, relName) {
+        var plugin,
+            parts = splitPrefix(name),
+            prefix = parts[0];
+
+        name = parts[1];
+
+        if (prefix) {
+            prefix = normalize(prefix, relName);
+            plugin = callDep(prefix);
+        }
+
+        //Normalize according
+        if (prefix) {
+            if (plugin && plugin.normalize) {
+                name = plugin.normalize(name, makeNormalize(relName));
+            } else {
+                name = normalize(name, relName);
+            }
+        } else {
+            name = normalize(name, relName);
+            parts = splitPrefix(name);
+            prefix = parts[0];
+            name = parts[1];
+            if (prefix) {
+                plugin = callDep(prefix);
+            }
+        }
+
+        //Using ridiculous property names for space reasons
+        return {
+            f: prefix ? prefix + '!' + name : name, //fullName
+            n: name,
+            pr: prefix,
+            p: plugin
+        };
+    };
+
+    function makeConfig(name) {
+        return function () {
+            return (config && config.config && config.config[name]) || {};
+        };
     }
 
-    //Using ridiculous property names for space reasons
-    return {
-      f: prefix ? prefix + '!' + name : name, //fullName
-      n: name,
-      pr: prefix,
-      p: plugin
+    handlers = {
+        require: function (name) {
+            return makeRequire(name);
+        },
+        exports: function (name) {
+            var e = defined[name];
+            if (typeof e !== 'undefined') {
+                return e;
+            } else {
+                return (defined[name] = {});
+            }
+        },
+        module: function (name) {
+            return {
+                id: name,
+                uri: '',
+                exports: defined[name],
+                config: makeConfig(name)
+            };
+        }
     };
-  };
 
-  function makeConfig(name) {
-    return function () {
-      return (config && config.config && config.config[name]) || {};
+    main = function (name, deps, callback, relName) {
+        var cjsModule, depName, ret, map, i,
+            args = [],
+            callbackType = typeof callback,
+            usingExports;
+
+        //Use name if no relName
+        relName = relName || name;
+
+        //Call the callback to define the module, if necessary.
+        if (callbackType === 'undefined' || callbackType === 'function') {
+            //Pull out the defined dependencies and pass the ordered
+            //values to the callback.
+            //Default to [require, exports, module] if no deps
+            deps = !deps.length && callback.length ? ['require', 'exports', 'module'] : deps;
+            for (i = 0; i < deps.length; i += 1) {
+                map = makeMap(deps[i], relName);
+                depName = map.f;
+
+                //Fast path CommonJS standard dependencies.
+                if (depName === "require") {
+                    args[i] = handlers.require(name);
+                } else if (depName === "exports") {
+                    //CommonJS module spec 1.1
+                    args[i] = handlers.exports(name);
+                    usingExports = true;
+                } else if (depName === "module") {
+                    //CommonJS module spec 1.1
+                    cjsModule = args[i] = handlers.module(name);
+                } else if (hasProp(defined, depName) ||
+                           hasProp(waiting, depName) ||
+                           hasProp(defining, depName)) {
+                    args[i] = callDep(depName);
+                } else if (map.p) {
+                    map.p.load(map.n, makeRequire(relName, true), makeLoad(depName), {});
+                    args[i] = defined[depName];
+                } else {
+                    throw new Error(name + ' missing ' + depName);
+                }
+            }
+
+            ret = callback ? callback.apply(defined[name], args) : undefined;
+
+            if (name) {
+                //If setting exports via "module" is in play,
+                //favor that over return value and exports. After that,
+                //favor a non-undefined return value over exports use.
+                if (cjsModule && cjsModule.exports !== undef &&
+                        cjsModule.exports !== defined[name]) {
+                    defined[name] = cjsModule.exports;
+                } else if (ret !== undef || !usingExports) {
+                    //Use the return value from the function.
+                    defined[name] = ret;
+                }
+            }
+        } else if (name) {
+            //May just be an object definition for the module. Only
+            //worry about defining if have a module name.
+            defined[name] = callback;
+        }
     };
-  }
-
-  handlers = {
-    require: function (name) {
-      return makeRequire(name);
-    },
-    exports: function (name) {
-      var e = defined[name];
-      if (typeof e !== 'undefined') {
-        return e;
-      } else {
-        return (defined[name] = {});
-      }
-    },
-    module: function (name) {
-      return {
-        id: name,
-        uri: '',
-        exports: defined[name],
-        config: makeConfig(name)
-      };
-    }
-  };
-
-  main = function (name, deps, callback, relName) {
-    var cjsModule, depName, ret, map, i,
-        args = [],
-        usingExports;
-
-    //Use name if no relName
-    relName = relName || name;
-
-    //Call the callback to define the module, if necessary.
-    if (typeof callback === 'function') {
-
-      //Pull out the defined dependencies and pass the ordered
-      //values to the callback.
-      //Default to [require, exports, module] if no deps
-      deps = !deps.length && callback.length ? ['require', 'exports', 'module'] : deps;
-      for (i = 0; i < deps.length; i += 1) {
-        map = makeMap(deps[i], relName);
-        depName = map.f;
-
-        //Fast path CommonJS standard dependencies.
-        if (depName === "require") {
-          args[i] = handlers.require(name);
-        } else if (depName === "exports") {
-          //CommonJS module spec 1.1
-          args[i] = handlers.exports(name);
-          usingExports = true;
-        } else if (depName === "module") {
-          //CommonJS module spec 1.1
-          cjsModule = args[i] = handlers.module(name);
-        } else if (hasProp(defined, depName) ||
-            hasProp(waiting, depName) ||
-            hasProp(defining, depName)) {
-          args[i] = callDep(depName);
-        } else if (map.p) {
-          map.p.load(map.n, makeRequire(relName, true), makeLoad(depName), {});
-          args[i] = defined[depName];
-        } else {
-          throw new Error(name + ' missing ' + depName);
+
+    requirejs = require = req = function (deps, callback, relName, forceSync, alt) {
+        if (typeof deps === "string") {
+            if (handlers[deps]) {
+                //callback in this case is really relName
+                return handlers[deps](callback);
+            }
+            //Just return the module wanted. In this scenario, the
+            //deps arg is the module name, and second arg (if passed)
+            //is just the relName.
+            //Normalize module name, if it contains . or ..
+            return callDep(makeMap(deps, callback).f);
+        } else if (!deps.splice) {
+            //deps is a config object, not an array.
+            config = deps;
+            if (config.deps) {
+                req(config.deps, config.callback);
+            }
+            if (!callback) {
+                return;
+            }
+
+            if (callback.splice) {
+                //callback is an array, which means it is a dependency list.
+                //Adjust args if there are dependencies
+                deps = callback;
+                callback = relName;
+                relName = null;
+            } else {
+                deps = undef;
+            }
         }
-      }
-
-      ret = callback.apply(defined[name], args);
-
-      if (name) {
-        //If setting exports via "module" is in play,
-        //favor that over return value and exports. After that,
-        //favor a non-undefined return value over exports use.
-        if (cjsModule && cjsModule.exports !== undef &&
-            cjsModule.exports !== defined[name]) {
-          defined[name] = cjsModule.exports;
-        } else if (ret !== undef || !usingExports) {
-          //Use the return value from the function.
-          defined[name] = ret;
+
+        //Support require(['a'])
+        callback = callback || function () {};
+
+        //If relName is a function, it is an errback handler,
+        //so remove it.
+        if (typeof relName === 'function') {
+            relName = forceSync;
+            forceSync = alt;
         }
-      }
-    } else if (name) {
-      //May just be an object definition for the module. Only
-      //worry about defining if have a module name.
-      defined[name] = callback;
-    }
-  };
-
-  requirejs = require = req = function (deps, callback, relName, forceSync, alt) {
-    if (typeof deps === "string") {
-      if (handlers[deps]) {
-        //callback in this case is really relName
-        return handlers[deps](callback);
-      }
-      //Just return the module wanted. In this scenario, the
-      //deps arg is the module name, and second arg (if passed)
-      //is just the relName.
-      //Normalize module name, if it contains . or ..
-      return callDep(makeMap(deps, callback).f);
-    } else if (!deps.splice) {
-      //deps is a config object, not an array.
-      config = deps;
-      if (callback.splice) {
-        //callback is an array, which means it is a dependency list.
-        //Adjust args if there are dependencies
-        deps = callback;
-        callback = relName;
-        relName = null;
-      } else {
-        deps = undef;
-      }
-    }
 
-    //Support require(['a'])
-    callback = callback || function () {};
+        //Simulate async callback;
+        if (forceSync) {
+            main(undef, deps, callback, relName);
+        } else {
+            //Using a non-zero value because of concern for what old browsers
+            //do, and latest browsers "upgrade" to 4 if lower value is used:
+            //http://www.whatwg.org/specs/web-apps/current-work/multipage/timers.html#dom-windowtimers-settimeout:
+            //If want a value immediately, use require('id') instead -- something
+            //that works in almond on the global level, but not guaranteed and
+            //unlikely to work in other AMD implementations.
+            setTimeout(function () {
+                main(undef, deps, callback, relName);
+            }, 4);
+        }
 
-    //If relName is a function, it is an errback handler,
-    //so remove it.
-    if (typeof relName === 'function') {
-      relName = forceSync;
-      forceSync = alt;
-    }
+        return req;
+    };
 
-    //Simulate async callback;
-    if (forceSync) {
-      main(undef, deps, callback, relName);
-    } else {
-      //Using a non-zero value because of concern for what old browsers
-      //do, and latest browsers "upgrade" to 4 if lower value is used:
-      //http://www.whatwg.org/specs/web-apps/current-work/multipage/timers.html#dom-windowtimers-settimeout:
-      //If want a value immediately, use require('id') instead -- something
-      //that works in almond on the global level, but not guaranteed and
-      //unlikely to work in other AMD implementations.
-      setTimeout(function () {
-        main(undef, deps, callback, relName);
-      }, 4);
-    }
+    /**
+     * Just drops the config on the floor, but returns req in case
+     * the config return value is used.
+     */
+    req.config = function (cfg) {
+        return req(cfg);
+    };
 
-    return req;
-  };
-
-  /**
-   * Just drops the config on the floor, but returns req in case
-   * the config return value is used.
-   */
-  req.config = function (cfg) {
-    config = cfg;
-    if (config.deps) {
-      req(config.deps, config.callback);
-    }
-    return req;
-  };
-
-  define = function (name, deps, callback) {
-
-    //This module may not have dependencies
-    if (!deps.splice) {
-      //deps is not an array, so probably means
-      //an object literal or factory function for
-      //the value. Adjust args.
-      callback = deps;
-      deps = [];
-    }
+    /**
+     * Expose module registry for debugging and tooling
+     */
+    requirejs._defined = defined;
 
-    if (!hasProp(defined, name) && !hasProp(waiting, name)) {
-      waiting[name] = [name, deps, callback];
-    }
-  };
+    define = function (name, deps, callback) {
+
+        //This module may not have dependencies
+        if (!deps.splice) {
+            //deps is not an array, so probably means
+            //an object literal or factory function for
+            //the value. Adjust args.
+            callback = deps;
+            deps = [];
+        }
 
-  define.amd = {
-    jQuery: true
-  };
-}());
+        if (!hasProp(defined, name) && !hasProp(waiting, name)) {
+            waiting[name] = [name, deps, callback];
+        }
+    };
+
+    define.amd = {
+        jQuery: true
+    };
+}());