opal · Nov 25, 2013 · Nov 25, 2013
Showing with 19 additions and 13 deletions.

+9 −4 opal/corelib/kernel.rb

+10 −9 opal/corelib/module.rb
diff --git a/opal/corelib/kernel.rb b/opal/corelib/kernel.rb
@@ -147,12 +147,17 @@ def equal?(other)
 
   def extend(*mods)
     %x{
-      for (var i = 0, length = mods.length; i < length; i++) {
-        #{ self.singleton_class.include `mods[i]` };
-      }
+      var singleton = #{singleton_class};
 
-      return self;
+      for (var i = mods.length - 1; i >= 0; i--) {
+        var mod = mods[i];
+
+        #{`mod`.append_features `singleton`};
+        #{`mod`.extended self};
+      }
     }
+
+    self
   end
 
   def format(format, *args)

diff --git a/opal/corelib/module.rb b/opal/corelib/module.rb
@@ -295,21 +295,19 @@ def remove_method(name)
 
   def include(*mods)
     %x{
-      var i = mods.length - 1, mod;
-      while (i >= 0) {
-        mod = mods[i];
-        i--;
+      for (var i = mods.length - 1; i >= 0; i--) {
+        var mod = mods[i];
 
-        if (mod === #{self}) {
+        if (mod === self) {
           continue;
         }
 
-        #{ `mod`.append_features self };
-        #{ `mod`.included self };
+        #{`mod`.append_features self};
+        #{`mod`.included self};
       }
-
-      return #{self};
     }
+
+    self
   end
 
   def instance_method(name)
@@ -349,6 +347,9 @@ def instance_methods(include_super = false)
   def included(mod)
   end
 
+  def extended(mod)
+  end
+
   def module_eval(&block)
     %x{
       if (block === nil) {