opal · Jan 25, 2014 · Jan 25, 2014
Showing with 16 additions and 40 deletions.

+10 −34 opal/browser/dom/event.rb

+6 −6 opal/browser/support.rb
diff --git a/opal/browser/dom/event.rb b/opal/browser/dom/event.rb
@@ -41,34 +41,6 @@ def self.name_for(name)
     (aliases[name] || name).gsub(?:, '')
   end
 
-  def self.classes
-    @classes ||= {
-      Animation         => $$[:AnimationEvent],
-      AudioProcessing   => $$[:AudioProcessingEvent],
-      BeforeUnload      => $$[:BeforeUnloadEvent],
-      Composition       => $$[:CompositionEvent],
-      Clipboard         => $$[:ClipboardEvent],
-      DeviceLight       => $$[:DeviceLightEvent],
-      DeviceMotion      => $$[:DeviceMotionEvent],
-      DeviceOrientation => $$[:DeviceOrientationEvent],
-      DeviceProximity   => $$[:DeviceProximityEvent],
-      Drag              => $$[:DragEvent],
-      Gamepad           => $$[:GamepadEvent],
-      HashChange        => $$[:HashChangeEvent],
-      Progress          => $$[:ProgressEvent],
-      PageTransition    => $$[:PageTransitionEvent],
-      PopState          => $$[:PopStateEvent],
-      Storage           => $$[:StorageEvent],
-      Touch             => $$[:TouchEvent],
-      Sensor            => $$[:SensorEvent],
-      Mouse             => $$[:MouseEvent],
-      Keyboard          => $$[:KeyboardEvent],
-      Focus             => $$[:FocusEvent],
-      Wheel             => $$[:WheelEvent],
-      Custom            => $$[:CustomEvent]
-    }
-  end
-
   def self.class_for(name)
     type = case name_for(name)
       when 'animationend', 'animationiteration', 'animationstart'
@@ -169,11 +141,15 @@ def self.class_for(name)
     end
   end
 
+  def self.supported?
+    true
+  end
+
   def self.create(name, *args, &block)
     name  = name_for(name)
     klass = class_for(name)
 
-    event           = new(klass.construct(name, klass.const_get(:Definition).new(&block)))
+    event           = klass.new(klass.construct(name, klass.const_get(:Definition).new(&block)))
     event.arguments = args
 
     event
@@ -185,12 +161,12 @@ def self.construct(name, desc)
   end
 
   def self.new(value, *args)
-    klass, _ = classes.find {|_, constructor|
-      Native.is_a?(value, constructor)
-    }
+    return super unless self == Event
+
+    klass = class_for(`value.type`)
 
-    if !klass || klass == self
-      super(value, *args)
+    if klass == Event
+      super
     else
       klass.new(value, *args)
     end

diff --git a/opal/browser/support.rb b/opal/browser/support.rb
@@ -128,22 +128,22 @@ def self.supports?(base, *extra)
           defined?(`document.createEventObject`)
 
         when :addListener
-          defined?(`window.addEventListener`)
+          defined?(`document.documentElement.addEventListener`)
 
         when :attach
-          defined?(`window.attachEvent`)
+          defined?(`document.documentElement.attachEvent`)
 
         when :removeListener
-          defined?(`window.removeEventListener`)
+          defined?(`document.documentElement.removeEventListener`)
 
         when :detach
-          defined?(`window.detachEvent`)
+          defined?(`document.documentElement.detachEvent`)
 
         when :dispatch
-          defined?(`window.dispatchEvent`)
+          defined?(`document.documentElement.dispatchEvent`)
 
         when :fire
-          defined?(`window.fireEvent`)
+          defined?(`document.documentElement.fireEvent`)
         end
 
       when :document