Mark loaded files

elia · elia · commit dbd2ef2eb4b8 · 2014-01-18T01:34:53.000+01:00
diff --git a/lib/opal/sprockets/processor.rb b/lib/opal/sprockets/processor.rb
@@ -89,7 +89,7 @@ def evaluate(context, locals, &block)
           compiler.compile File.read(path), options.merge(:file => r, :requireable => true)
         else
           context.require_asset r
-          ''
+          "Opal.loaded[#{r.inspect}] = true;"
         end
       end.join("\n")
 
diff --git a/opal/corelib/runtime.js b/opal/corelib/runtime.js
@@ -886,9 +886,23 @@
   TypeError._super = Error;
 
   Opal.modules = {};
+  Opal.loaded = {};
   Opal.require = function(name) {
+    if (Opal.loaded[name]) {
+      return false;
+    }
+
     var module;
-    module = Opal.modules[name] || throw Opal.LoadError.$new("cannot load such file -- "+name);
-    module(Opal);
+    if (module = Opal.modules[name]) {
+      Opal.loaded[name] = true;
+      module(Opal)
+      return true
+    } else {
+      if (Opal.LoadError) {
+        throw Opal.LoadError.$new("cannot load such file -- "+name);
+      } else {
+        throw("cannot load such file -- "+name);
+      }
+    }
   }
 }).call(this);
