opal-browser 0.2.0 → 0.3.3

data/opal/browser/event/composition.rb

@@ -1,6 +1,8 @@
 module Browser; class Event
 
 class Composition < UI
+  handles 'compositionend', 'compositionstart', 'compositionupdate'
+
   def self.supported?
     Browser.supports? 'Event.Composition'
   end

data/opal/browser/event/custom.rb

@@ -17,7 +17,7 @@ class Custom < Event
 
   if Browser.supports? 'Event.constructor'
     def self.construct(name, desc)
-      `new CustomEvent(name, {
+      `return new CustomEvent(name, {
         bubbles:    desc.bubbles,
         cancelable: desc.cancelable,
         detail:     desc })`

data/opal/browser/event/data_transfer.rb

@@ -0,0 +1,95 @@
+require 'browser/blob'
+
+module Browser; class Event
+
+# {DataTransfer} is an object which manages included data to
+# an event of type {Event::Drag} or {Event::Clipboard}.
+class DataTransfer
+  include NativeCachedWrapper
+
+  # @!attribute [rw] effect
+  # @return [Symbol] Effect of this drop operation.
+  #   Must be one of: :none, :copy, :link or :move.
+  def effect
+    `#@native.dropEffect`
+  end
+
+  def effect= (effect)
+    `#@native.dropEffect = #{effect}`
+  end
+
+  # Extract some text data from this {DataTransfer} instance.
+  def [] (type)
+    `#@native.getData(#{type})`
+  end
+
+  # Embed some text data in this {DataTransfer} instance.
+  def []= (type, value)
+    `#@native.setData(#{type}, #{Native.convert(value)})`
+  end
+
+  # Clear some (or all, if type is not specified) text data from
+  # this {DataTransfer} instance.
+  def clear (type=nil)
+    `#@native.clearData(#{type.to_n})`
+  end
+
+  # @!attribute [w] drag_image
+  # Sets a drag image for this {DataTransfer}. Use some
+  # {DOM::Element::Image} or {Canvas} as a value.
+  def drag_image= (image)
+    `#@native.setDragImage(#{Native.convert(image)})`
+  end
+
+  # @!attribute [r] files
+  # @return [Array<File>] list of files attached to this {DataTransfer}
+  def files
+    Native::Array.new(`#@native.files`).map { |f| File.new(f.to_n) }
+  end
+
+  # @!attribute [r] items
+  # @return [Array<Item>] list of items attached to this {DataTransfer}
+  def items
+    Native::Array.new(`#@native.items`).map { |i| Item.new(i.to_n) }
+  end
+
+  # An instance of `DataTransferItem`
+  class Item
+    include NativeCachedWrapper
+
+    # @!attribute [r] kind
+    # @return [Symbol] kind of an item: :string or :file
+    def kind
+      `#@native.kind`
+    end
+
+    def string?; kind == 'string';           end
+    def file?;   kind == 'file' && to_file;  end # Some files can't be resolved...
+
+    # @!attribute [r] type
+    # @return [String] mime type of an item
+    def type
+      `#@native.type`
+    end
+
+    # Convert to string and call back once ready, or return a
+    # promise if a block isn't given.
+    def to_string(&block)
+      promise = nil
+      if !block
+        promise = Promise.new
+        block = proc { |i| promise.resolve(i) }
+      end
+      `#@native.getAsString(#{block.to_n})`
+      return promise
+    end
+
+    # Convert to file or return nil if impossible
+    def to_file
+      as_file = `#@native.getAsFile()`
+      File.new(as_file) if as_file
+    end
+  end
+end
+
+end; end

data/opal/browser/event/device_light.rb

@@ -1,6 +1,8 @@
 module Browser; class Event
 
 class DeviceLight < Event
+  handles 'devicelight'
+
   def self.supported?
     Browser.supports? 'Event.DeviceLight'
   end

data/opal/browser/event/device_motion.rb

@@ -1,6 +1,8 @@
 module Browser; class Event
 
 class DeviceMotion < Event
+  handles 'devicemotion'
+  
   def self.supported?
     Browser.supports? 'Event.DeviceMotion'
   end

data/opal/browser/event/device_orientation.rb

@@ -1,6 +1,8 @@
 module Browser; class Event
 
 class DeviceOrientation < Event
+  handles 'deviceorientation'
+
   def self.supported?
     Browser.supports? 'Event.DeviceOrientation'
   end

data/opal/browser/event/device_proximity.rb

@@ -1,6 +1,8 @@
 module Browser; class Event
 
 class DeviceProximity < Event
+  handles 'deviceproximity'
+
   def self.supported?
     Browser.supports? 'Event.DeviceProximity'
   end

data/opal/browser/event/drag.rb

@@ -1,14 +1,16 @@
 module Browser; class Event
 
-# TODO: handle transfers
 class Drag < Event
+  handles 'drag', 'dragend', 'dragenter', 'dragexit', 'dragleave', 'dragover',
+          'dragstart', 'drop'
+
   def self.supported?
     Browser.supports? 'Event.Drag'
   end
 
   class Definition < Definition
     class Client
-      include Native
+      include Native::Wrapper
 
       def x=(value)
         `#@native.clientX = #{value}`
@@ -20,7 +22,7 @@ class Drag < Event
     end
 
     class Screen
-      include Native
+      include Native::Wrapper
 
       def x=(value)
         `#@native.screenX = #{value}`
@@ -60,7 +62,7 @@ class Drag < Event
     end
 
     def transfer=(value)
-      `#@native.dataTransfer = #{Native.convert(elem)}`
+      `#@native.dataTransfer = #{Native.convert(value)}`
     end
   end
 
@@ -110,9 +112,11 @@ class Drag < Event
     DOM(`#@native.relatedTarget`)
   end
 
+  # Returns a {DataTransfer} related to this event
+  #
   # @see https://developer.mozilla.org/en-US/docs/Web/API/DataTransfer
   def transfer
-    raise NotImplementedError
+    DataTransfer.new(`#@native.dataTransfer`)
   end
 end
 

data/opal/browser/event/focus.rb

@@ -1,6 +1,8 @@
 module Browser; class Event
 
 class Focus < UI
+  handles 'blur', 'focus', 'focusin', 'focusout'
+
   def self.supported?
     Browser.supports? 'Event.Focus'
   end

data/opal/browser/event/gamepad.rb

@@ -1,6 +1,8 @@
 module Browser; class Event
 
 class Gamepad < Event
+  handles 'gamepadconnected', 'gamepaddisconnected'
+
   def self.supported?
     Browser.supports? 'Event.Gamepad'
   end
@@ -29,7 +31,7 @@ class Gamepad < Event
 
   if Browser.supports? 'Event.constructor'
     def self.construct(name, desc)
-      `new GamepadEvent(#{name}, {
+      `return new GamepadEvent(#{name}, {
         bubbles:    desc.bubbles,
         cancelable: desc.cancelable,
         gamepad:    desc })`

data/opal/browser/event/hash_change.rb

@@ -1,6 +1,8 @@
 module Browser; class Event
 
 class HashChange < Event
+  handles 'hashchange'
+
   def self.supported?
     Browser.supports? 'Event.HashChange'
   end

data/opal/browser/event/keyboard.rb

@@ -1,6 +1,8 @@
 module Browser; class Event
 
 class Keyboard < UI
+  handles 'keydown', 'keypress', 'keyup'
+
   def self.supported?
     Browser.supports? 'Event.Keyboard'
   end
@@ -85,8 +87,19 @@ class Keyboard < UI
   alias_native :locale
   alias_native :repeat?, :repeat
 
+  # IE 11 at least has different names for those keys.
+  IE_MAP = {
+    'Down' => 'ArrowDown',
+    'Up' => 'ArrowUp',
+    'Left' => 'ArrowLeft',
+    'Right' => 'ArrowRight',
+    'Esc' => 'Escape',
+    'Del' => 'Delete'
+  }
+
   def key
-    `#@native.key || #@native.keyIdentifier || nil`
+    key = `#@native.key || #@native.keyIdentifier || nil`
+    IE_MAP[key] || key
   end
 
   def code

data/opal/browser/event/message.rb

@@ -3,6 +3,8 @@ require 'buffer'
 module Browser; class Event
 
 class Message < Event
+  handles 'message'
+
   def self.supported?
     Browser.supports? 'Event.Message'
   end

data/opal/browser/event/mouse.rb

@@ -1,13 +1,17 @@
 module Browser; class Event
 
 class Mouse < UI
+  handles 'click', 'contextmenu', 'dblclick', 'mousedown', 'mouseenter',
+          'mouseleave', 'mousemove', 'mouseout', 'mouseover', 'mouseup',
+          'show'
+
   def self.supported?
     not $$[:MouseEvent].nil?
   end
 
   class Definition < UI::Definition
     class Client
-      include Native
+      include Native::Wrapper
 
       def x=(value)
         `#@native.clientX = #{value}`
@@ -19,7 +23,7 @@ class Mouse < UI
     end
 
     class Layer
-      include Native
+      include Native::Wrapper
 
       def x=(value)
         `#@native.layerX = #{value}`
@@ -31,7 +35,7 @@ class Mouse < UI
     end
 
     class Offset
-      include Native
+      include Native::Wrapper
 
       def x=(value)
         `#@native.offsetX = #{value}`
@@ -43,7 +47,7 @@ class Mouse < UI
     end
 
     class Page
-      include Native
+      include Native::Wrapper
 
       def x=(value)
         `#@native.pageX = #{value}`
@@ -55,7 +59,7 @@ class Mouse < UI
     end
 
     class Screen
-      include Native
+      include Native::Wrapper
 
       def x=(value)
         `#@native.screenX = #{value}`
@@ -67,7 +71,7 @@ class Mouse < UI
     end
 
     class Ancestor
-      include Native
+      include Native::Wrapper
 
       def x=(value)
         `#@native.x = #{value}`

data/opal/browser/event/page_transition.rb

@@ -1,6 +1,8 @@
 module Browser; class Event
 
 class PageTransition < Event
+  handles 'pagehide', 'pageshow'
+
   def self.supported?
     Browser.supports? 'Event.PageTransition'
   end

data/opal/browser/event/pop_state.rb

@@ -1,6 +1,8 @@
 module Browser; class Event
 
 class PopState < Event
+  handles 'popstate'
+
   def self.supported?
     Browser.supports? 'Event.PopState'
   end

data/opal/browser/event/progress.rb

@@ -1,6 +1,8 @@
 module Browser; class Event
 
 class Progress < Event
+  handles 'progress', 'load', 'loadend', 'loadstart'
+
   def self.supported?
     Browser.supports? 'Event.Progress'
   end

data/opal/browser/event/sensor.rb

@@ -1,6 +1,8 @@
 module Browser; class Event
 
 class Sensor < Event
+  handles 'compassneedscalibration', 'userproximity'
+
   def self.supported?
     Browser.supports? 'Event.Sensor'
   end

data/opal/browser/event/storage.rb

@@ -1,6 +1,8 @@
 module Browser; class Event
 
 class Storage < Event
+  handles 'storage'
+
   def self.supported?
     Browser.supports? 'Event.Storage'
   end

data/opal/browser/event/touch.rb

@@ -1,6 +1,8 @@
 module Browser; class Event
 
 class Touch < Event
+  handles 'touchcancel', 'touchend', 'touchleave', 'touchmove', 'touchstart'
+
   def self.supported?
     Browser.supports? 'Event.Touch'
   end

data/opal/browser/event/wheel.rb

@@ -1,6 +1,8 @@
 module Browser; class Event
 
 class Wheel < UI
+  handles 'wheel', 'mousewheel'
+
   def self.supported?
     not $$[:WheelEvent].nil?
   end

data/opal/browser/event.rb

@@ -1,31 +1,4 @@
 require 'browser/event/base'
-require 'browser/event/ui'
-require 'browser/event/mouse'
-require 'browser/event/keyboard'
-require 'browser/event/focus'
-require 'browser/event/wheel'
-require 'browser/event/composition'
-require 'browser/event/animation'
-require 'browser/event/audio_processing'
-require 'browser/event/before_unload'
-require 'browser/event/composition'
-require 'browser/event/clipboard'
-require 'browser/event/device_light'
-require 'browser/event/device_motion'
-require 'browser/event/device_orientation'
-require 'browser/event/device_proximity'
-require 'browser/event/drag'
-require 'browser/event/gamepad'
-require 'browser/event/hash_change'
-require 'browser/event/progress'
-require 'browser/event/page_transition'
-require 'browser/event/pop_state'
-require 'browser/event/storage'
-require 'browser/event/touch'
-require 'browser/event/sensor'
-require 'browser/event/custom'
-require 'browser/event/message'
-require 'browser/event/close'
 
 module Browser
 
@@ -41,98 +14,30 @@ class Event
     (aliases[name] || name).gsub(?:, '')
   end
 
-  def self.class_for(name)
-    case name_for(name)
-      when 'animationend', 'animationiteration', 'animationstart'
-        Animation
-
-      when 'audioprocess'
-        AudioProcessing
-
-      when 'beforeunload'
-        BeforeUnload
-
-      when 'compositionend', 'compositionstart', 'compositionupdate'
-        Composition
-
-      when 'copy', 'cut'
-        Clipboard
-
-      when 'devicelight'
-        DeviceLight
-
-      when 'devicemotion'
-        DeviceMotion
-
-      when 'deviceorientation'
-        DeviceOrientation
-
-      when 'deviceproximity'
-        DeviceProximity
-
-      when 'drag', 'dragend', 'dragleave', 'dragover', 'dragstart', 'drop'
-        Drag
-
-      when 'gamepadconnected', 'gamepaddisconnected'
-        Gamepad
-
-      when 'hashchange'
-        HashChange
-
-      when 'load', 'loadend', 'loadstart'
-        Progress
-
-      when 'pagehide', 'pageshow'
-        PageTransition
-
-      when 'popstate'
-        PopState
-
-      when 'storage'
-        Storage
-
-      when 'touchcancel', 'touchend', 'touchleave', 'touchmove', 'touchstart'
-        Touch
-
-      when 'compassneedscalibration', 'userproximity'
-        Sensor
-
-      when 'message'
-        Message
-
-      when 'close'
-        Close
-
-      when 'click', 'contextmenu', 'dblclick', 'mousedown', 'mouseenter',
-           'mouseleave', 'mousemove', 'mouseout', 'mouseover', 'mouseup',
-           'show'
-        Mouse
-
-      when 'keydown', 'keypress', 'keyup'
-        Keyboard
-
-      when 'blur', 'focus', 'focusin', 'focusout'
-        Focus
+  def self.handlers
+    @handlers ||= {}
+  end
 
-      when 'wheel'
-        Wheel
+  def self.handles(*events)
+    events.each { |event| Event.handlers[event] = self }
+  end
 
-      when 'abort', 'afterprint', 'beforeprint', 'cached', 'canplay',
-           'canplaythrough', 'change', 'chargingchange', 'chargingtimechange',
-           'checking', 'close', 'dischargingtimechange', 'DOMContentLoaded',
-           'downloading', 'durationchange', 'emptied', 'ended', 'error',
-           'fullscreenchange', 'fullscreenerror', 'input', 'invalid',
-           'levelchange', 'loadeddata', 'loadedmetadata', 'noupdate', 'obsolete',
-           'offline', 'online', 'open', 'orientationchange', 'pause',
-           'pointerlockchange', 'pointerlockerror', 'play', 'playing',
-           'ratechange', 'readystatechange', 'reset', 'seeked', 'seeking',
-           'stalled', 'submit', 'success', 'suspend', 'timeupdate', 'updateready',
-           'visibilitychange', 'volumechange', 'waiting'
-        Event
+  # Those events don't have interesting properties to warrant a custom class
+  # or are not currently implemented.
+  handles 'abort', 'afterprint', 'beforeprint', 'cached', 'canplay',
+          'canplaythrough', 'change', 'chargingchange', 'chargingtimechange',
+          'checking', 'close', 'dischargingtimechange', 'DOMContentLoaded',
+          'downloading', 'durationchange', 'emptied', 'ended', 'error',
+          'fullscreenchange', 'fullscreenerror', 'input', 'invalid',
+          'levelchange', 'loadeddata', 'loadedmetadata', 'noupdate', 'obsolete',
+          'offline', 'online', 'open', 'orientationchange', 'pause',
+          'pointerlockchange', 'pointerlockerror', 'play', 'playing',
+          'ratechange', 'readystatechange', 'reset', 'seeked', 'seeking',
+          'stalled', 'submit', 'success', 'suspend', 'timeupdate', 'updateready',
+          'visibilitychange', 'volumechange', 'waiting'
 
-      else
-        Custom
-    end
+  def self.class_for(name)
+    @handlers[name_for(name)] || Custom
   end
 
   def self.supported?
@@ -251,3 +156,8 @@ class Event
 end
 
 end
+
+require 'browser/event/ui'
+require 'browser/event/mouse'
+require 'browser/event/keyboard'
+require 'browser/event/custom'

data/opal/browser/event_source.rb

@@ -9,7 +9,7 @@ class EventSource
     Browser.supports? :EventSource
   end
 
-  include Native
+  include Native::Wrapper
   include Event::Target
 
   target {|value|