Added basic browser support for r.js.

requirejs · jbeard4 · Jan 9, 2012 · Jan 12, 2012 · Jan 12, 2012 · 1dd826d3bf5ee67991f3d21c66f87d6ed3f637a0
commit 1dd826d3bf5ee67991f3d21c66f87d6ed3f637a0
diff --git a/build/jslib/browser/args.js b/build/jslib/browser/args.js
@@ -0,0 +1 @@
+define(function(){return function(){};});
diff --git a/build/jslib/browser/file.js b/build/jslib/browser/file.js
@@ -0,0 +1 @@
+define(function(){return function(){};});
diff --git a/build/jslib/browser/load.js b/build/jslib/browser/load.js
@@ -0,0 +1,2 @@
+//nothing to do here
+define(function(){return function(){};});
diff --git a/build/jslib/browser/optimize.js b/build/jslib/browser/optimize.js
@@ -0,0 +1 @@
+define(function(){return function(){};});
diff --git a/build/jslib/browser/print.js b/build/jslib/browser/print.js
@@ -0,0 +1,6 @@
+define(function(){
+	return function(){
+		console.log.apply(console,Array.prototype.slice.apply(arguments));
+	};
+});
+
diff --git a/build/jslib/browser/quit.js b/build/jslib/browser/quit.js
@@ -0,0 +1 @@
+define(function(){return function(){};});
diff --git a/build/jslib/x.js b/build/jslib/x.js
@@ -98,6 +98,8 @@ var requirejs, require, define;
             commandOption = fileName.substring(1);
             fileName = process.argv[3];
         }
+    } else if (typeof window !== "undefined" && navigator && document) {
+        env = 'browser';
     } else if (typeof load === 'function' && typeof print === 'function'){
         env = 'spartan';
 
@@ -119,7 +121,7 @@ var requirejs, require, define;
                 }
             };
         }
-	}
+    } 
 
     //INSERT require.js
 
@@ -249,15 +251,16 @@ var requirejs, require, define;
         //Just run an app
 
         //Load the bundled libraries for use in the app.
-        if (commandOption === 'lib') {
+        //browser loads libs by default
+        if (commandOption === 'lib' || env === 'browser') {
             loadLib();
         }
 
         setBaseUrl(fileName);
 
         if(env === 'spartan'){
             load(fileName);
-        } else{
+        } else if (env !== 'browser'){
             if (exists(fileName)) {
                 exec(readFile(fileName), fileName);
             } else {

diff --git a/dist.js b/dist.js
@@ -22,7 +22,7 @@ var fs = require('fs'),
     loadRegExp = /\/\/INSERT ([\w\/\.]+)/g,
     moduleNameRegExp = /build\/jslib\/([\w\/\-]+)\.js$/,
     defRegExp = /define\s*\(/,
-    envs = ['node', 'rhino', 'spartan'],
+    envs = ['node', 'rhino', 'spartan', 'browser'],
     //Update this list of files by running the optimizer against
     //build/jslib/opto.build.js,
     //but then remove any jslib/node entries and make sure there is
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		//nothing to do here
		define(function(){return function(){};});