fix mini require for the bookmarklet

build_support/mini_require.js

@@ -64,10 +64,10 @@ var _define = function(module, deps, payload) {
     if (arguments.length == 2)
         payload = deps;
 
-    if (!define.modules)
+    if (!_define.modules)
-        define.modules = {};
+        _define.modules = {};
         
-    define.modules[module] = payload;
+    _define.modules[module] = payload;
 };
 if (global.define)
     _define.original = global.define;
@@ -126,16 +126,16 @@ var normalizeModule = function(parentId, moduleName) {
     // normalize relative requires
     if (moduleName.charAt(0) == ".") {
         var base = parentId.split("/").slice(0, -1).join("/");
-        var moduleName = base + "/" + moduleName;
+        moduleName = base + "/" + moduleName;
         
         while(moduleName.indexOf(".") !== -1 && previous != moduleName) {
             var previous = moduleName;
-            var moduleName = moduleName.replace(/\/\.\//, "/").replace(/[^\/]+\/\.\.\//, "");
+            moduleName = moduleName.replace(/\/\.\//, "/").replace(/[^\/]+\/\.\.\//, "");
         }
     }
     
     return moduleName;
-}
+};
 
 
 /**
@@ -146,8 +146,8 @@ var lookup = function(parentId, moduleName) {
 
     moduleName = normalizeModule(parentId, moduleName);
 
-    var module = define.modules[moduleName];
+    var module = _define.modules[moduleName];
-    if (module == null) {
+    if (!module) {
         return null;
     }
 
@@ -157,7 +157,7 @@ var lookup = function(parentId, moduleName) {
             id: moduleName, 
             uri: '',
             exports: exports
-        }
+        };
         
         var req = function(module, callback) {
             return _require(moduleName, module, callback);
@@ -167,7 +167,7 @@ var lookup = function(parentId, moduleName) {
         exports = returnValue || mod.exports;
             
         // cache the resulting module object for next time
-        define.modules[moduleName] = exports;
+        _define.modules[moduleName] = exports;
         return exports;
     }
 

build_support/mini_require_textarea.js

@@ -67,22 +67,21 @@ var _define = function(module, deps, payload) {
 /**
  * Get at functionality define()ed using the function above
  */
-var _require = function(module, callback) {
+var _require = function(parentId, module, callback) {
     if (Object.prototype.toString.call(module) === "[object Array]") {
         var params = [];
         for (var i = 0, l = module.length; i < l; ++i) {
-            var dep = lookup(module[i]);
+            var dep = lookup(parentId, module[i]);
             if (!dep && _require.original)
                 return _require.original.apply(window, arguments);
             params.push(dep);
-        };
+        }
         if (callback) {
             callback.apply(null, params);
         }
     }
-
+    else if (typeof module === 'string') {
-    if (typeof module === 'string') {
+        var payload = lookup(parentId, module);
-        var payload = lookup(module);
         if (!payload && _require.original)
             return _require.original.apply(window, arguments);
         
@@ -91,26 +90,64 @@ var _require = function(module, callback) {
         }
     
         return payload;
-    };
     }
+    else {
+        if (_require.original)
+            return _require.original.apply(window, arguments);
+    }
+};
 
 _require.packaged = true;
 _require.noWorker = true;
 
+var normalizeModule = function(parentId, moduleName) {
+    // normalize plugin requires
+    if (moduleName.indexOf("!") !== -1) {
+        var chunks = moduleName.split("!");
+        return normalizeModule(parentId, chunks[0]) + "!" + normalizeModule(parentId, chunks[1]);
+    }
+    // normalize relative requires
+    if (moduleName.charAt(0) == ".") {
+        var base = parentId.split("/").slice(0, -1).join("/");
+        moduleName = base + "/" + moduleName;
+        
+        while(moduleName.indexOf(".") !== -1 && previous != moduleName) {
+            var previous = moduleName;
+            moduleName = moduleName.replace(/\/\.\//, "/").replace(/[^\/]+\/\.\.\//, "");
+        }
+    }
+    
+    return moduleName;
+};
+
 /**
  * Internal function to lookup moduleNames and resolve them by calling the
  * definition function if needed.
  */
-var lookup = function(moduleName) {
+var lookup = function(parentId, moduleName) {
+
+    moduleName = normalizeModule(parentId, moduleName);
+
     var module = _define.modules[moduleName];
-    if (module == null) {
+    if (!module) {
-        console.error('Missing module: ' + moduleName);
         return null;
     }
 
     if (typeof module === 'function') {
         var exports = {};
-        module(_require, exports, { id: moduleName, uri: '' });
+        var mod = {
+            id: moduleName, 
+            uri: '',
+            exports: exports
+        };
+        
+        var req = function(module, callback) {
+            return _require(moduleName, module, callback);
+        };
+        
+        var returnValue = module(req, exports, mod);
+        exports = returnValue || mod.exports;
+            
         // cache the resulting module object for next time
         _define.modules[moduleName] = exports;
         return exports;
@@ -119,12 +156,15 @@ var lookup = function(moduleName) {
     return module;
 };
 
+
 /**
  * Expose as "shadowed" object to the outside world.
  */
 
 window.__ace_shadowed__ = {
-    require: _require,
+    require: function(module, callback) {
+        return _require("", module, callback);
+    },
     define: _define
 };