From 3cc878f4c1550857986a27858577b2ca579a8397 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Thu, 21 Jun 2012 20:38:00 +0400
Subject: [PATCH] compatibility with dojo.require

---
 lib/ace/requirejs/text.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/ace/requirejs/text.js b/lib/ace/requirejs/text.js
index cf7ef666..6d6f59ce 100644
--- a/lib/ace/requirejs/text.js
+++ b/lib/ace/requirejs/text.js
@@ -41,17 +41,17 @@
  
 (function() {
     
-var globalRequire = require;
+var globalRequire = typeof require != "undefined" && require;
  
 define(function (require, exports, module) {
     "use strict";
     
     exports.load = function (name, req, onLoad, config) {
-        if (req.isBrowser)
-            require("ace/lib/net").get(req.toUrl(name), onLoad);
+        //Using special require.nodeRequire, something added by r.js.
+        if (globalRequire && globalRequire.nodeRequire)
+            onLoad(('fs').readFileSync(req.toUrl(name), 'utf8'));
         else
-            //Using special require.nodeRequire, something added by r.js.
-            onLoad(globalRequire.nodeRequire('fs').readFileSync(req.toUrl(name), 'utf8'));
+            require("ace/lib/net").get(req.toUrl(name), onLoad);
     };
 });