Skip to content
This repository
Browse code

update r-edge.js

  • Loading branch information...
commit f021ccfd4530b4fa6e5372769651d782e483193b 1 parent 6dbd370
James Burke authored January 06, 2012

Showing 1 changed file with 11 additions and 8 deletions. Show diff stats Hide diff stats

  1. 19  dist/r-edge.js
19  dist/r-edge.js
... ...
@@ -1,5 +1,5 @@
1 1
 /**
2  
- * @license r.js 1.0.2+ (traceFiles) 20111214 3pm Pacific  Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
  2
+ * @license r.js 1.0.2+ 20120106 10pm Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
3 3
  * Available via the MIT or new BSD license.
4 4
  * see: http://github.com/jrburke/requirejs for details
5 5
  */
@@ -20,7 +20,7 @@ var requirejs, require, define;
20 20
 
21 21
     var fileName, env, fs, vm, path, exec, rhinoContext, dir, nodeRequire,
22 22
         nodeDefine, exists, reqMain, loadedOptimizedLib,
23  
-        version = '1.0.2+ (traceFiles) 20111214 3pm Pacific',
  23
+        version = '1.0.2+ 20120106 10pm',
24 24
         jsSuffixRegExp = /\.js$/,
25 25
         commandOption = '',
26 26
         //Used by jslib/rhino/args.js
@@ -9048,20 +9048,22 @@ function (lang,   logger,   file,          parse,    optimize,   pragma,
9048 9048
     function loadBuildTools(callback) {
9049 9049
         loadLib();
9050 9050
 
  9051
+        var cb = function (build,   logger,   requirePatch) {
  9052
+            //Enable the requirePatch that hooks up the tracing tools.
  9053
+            requirePatch();
  9054
+            callback(build, logger);
  9055
+        };
  9056
+
9051 9057
         //Enable execution of this callback in a build setting.
9052 9058
         //Normally, once requirePatch is run, by default it will
9053 9059
         //not execute callbacks, unless this property is set on
9054 9060
         //the callback.
9055  
-        callback.__requireJsBuild = true;
  9061
+        cb.__requireJsBuild = true;
9056 9062
 
9057 9063
         requirejs({
9058 9064
             context: 'build'
9059 9065
         },      ['build', 'logger', 'requirePatch'],
9060  
-        function (build,   logger,   requirePatch) {
9061  
-            //Enable the requirePatch that hooks up the tracing tools.
9062  
-            requirePatch();
9063  
-            callback(build, logger);
9064  
-        });
  9066
+        cb);
9065 9067
     }
9066 9068
 
9067 9069
     /**
@@ -9140,6 +9142,7 @@ function (lang,   logger,   file,          parse,    optimize,   pragma,
9140 9142
          * Traces what files would go into making the module specified in the
9141 9143
          * config.
9142 9144
          */
  9145
+        requirejs.tools = {};
9143 9146
         requirejs.tools.traceFiles = traceFiles;
9144 9147
 
9145 9148
         module.exports = requirejs;

0 notes on commit f021ccf

Please sign in to comment.
Something went wrong with that request. Please try again.