Merge pull request #142 from jankeesvw/master

Updated Almond to 0.2.5 and Require to 2.1.8.

Author: carsomyr

lib/requirejs/rails/version.rb

@@ -1,6 +1,6 @@
 module Requirejs
   module Rails
     Version = "0.9.1"
-    LibVersion = "2.1.2"
+    LibVersion = "2.1.8"
   end
 end

vendor/assets/javascripts/almond.js

@@ -1,5 +1,5 @@
 /**
- * almond 0.2.3 Copyright (c) 2011-2012, The Dojo Foundation All Rights Reserved.
+ * almond 0.2.5 Copyright (c) 2011-2012, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/almond for details
  */
@@ -357,9 +357,15 @@ var requirejs, require, define;
     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);
-      }, 15);
+      }, 4);
     }
 
     return req;
@@ -371,6 +377,9 @@ var requirejs, require, define;
    */
   req.config = function (cfg) {
     config = cfg;
+    if (config.deps) {
+      req(config.deps, config.callback);
+    }
     return req;
   };
 
@@ -393,4 +402,4 @@ var requirejs, require, define;
   define.amd = {
     jQuery: true
   };
-}());
+}());