diff --git a/opal/opal-jquery/element.rb b/opal/opal-jquery/element.rb index 6fd0eeb..9f864c8 100644 --- a/opal/opal-jquery/element.rb +++ b/opal/opal-jquery/element.rb @@ -205,7 +205,7 @@ def css(name, value=nil) if value.nil? && name.is_a?(String) return `#{self}.css(name)` else - name.is_a?(Hash) ? `#{self}.css(#{name.to_native})` : `#{self}.css(name, value)` + name.is_a?(Hash) ? `#{self}.css(#{name.to_n})` : `#{self}.css(name, value)` end self end @@ -228,7 +228,7 @@ def css(name, value=nil) def animate(params, &block) speed = params.has_key?(:speed) ? params.delete(:speed) : 400 %x{ - #{self}.animate(#{params.to_native}, #{speed}, function() { + #{self}.animate(#{params.to_n}, #{speed}, function() { #{block.call if block_given?} }) } @@ -239,7 +239,7 @@ def animate(params, &block) # Also accepts additional arguments and a block for the finished callback. def effect(name, *args, &block) name = name.gsub(/_\w/) { |match| match[1].upcase } - args = args.map { |a| a.to_native if a.respond_to? :to_native }.compact + args = args.map { |a| a.to_n if a.respond_to? :to_n }.compact args << `function() { #{block.call if block_given?} }` `#{self}[#{name}].apply(#{self}, #{args})` end diff --git a/opal/opal-jquery/http.rb b/opal/opal-jquery/http.rb index c09e31f..aeaa269 100644 --- a/opal/opal-jquery/http.rb +++ b/opal/opal-jquery/http.rb @@ -30,7 +30,7 @@ def initialize(url, method, options, handler=nil) @xhr = nil http = self payload = options.delete :payload - settings = options.to_native + settings = options.to_n if handler @callback = @errback = handler