From 59acd23d2ca2b51c8535a365a09545389f8be1a5 Mon Sep 17 00:00:00 2001
From: Fabian Jakobs <fabian.jakobs@web.de>
Date: Mon, 2 Jan 2012 17:32:53 +0100
Subject: [PATCH] r.js fix

---
 lib/ace/lib/net.js        |  2 +-
 lib/ace/requirejs/text.js | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/lib/ace/lib/net.js b/lib/ace/lib/net.js
index fad1990b..692aead0 100644
--- a/lib/ace/lib/net.js
+++ b/lib/ace/lib/net.js
@@ -23,7 +23,7 @@ exports.get = function (url, callback) {
 
 var progIds = ['Msxml2.XMLHTTP', 'Microsoft.XMLHTTP', 'Msxml2.XMLHTTP.4.0'];
 
-exports.createXhr = function () {
+exports.createXhr = function() {
     //Would love to dump the ActiveX crap in here. Need IE 6 to die first.
     var xhr, i, progId;
     if (typeof XMLHttpRequest !== "undefined") {
diff --git a/lib/ace/requirejs/text.js b/lib/ace/requirejs/text.js
index 20953a71..eb056456 100644
--- a/lib/ace/requirejs/text.js
+++ b/lib/ace/requirejs/text.js
@@ -38,12 +38,21 @@
 /**
  * Extremely simplified version of the requireJS text plugin
  */
+ 
+(function() {
+    
+var globalRequire = require;
+ 
 define(function (require, exports, module) {
     "use strict";
     
-    var net = require("ace/lib/net");
-
     exports.load = function (name, req, onLoad, config) {
-         net.get(req.toUrl(name), onLoad);
+        if (req.isBrowser)
+            require("ace/lib/net").get(req.toUrl(name), onLoad);
+        else
+            //Using special require.nodeRequire, something added by r.js.
+            globalRequire.nodeRequire('fs').readFileSync(req.toUrl(name), 'utf8');
     };
-});
\ No newline at end of file
+});
+
+})();
\ No newline at end of file