opal · Jan 29, 2014 · Jan 29, 2014 · Jan 29, 2014
Showing with 80 additions and 33 deletions.

+0 −4 .travis.yml

+4 −0 index.html.erb

+37 −11 opal/browser/dom/element.rb

+1 −1 opal/browser/storage.rb

+21 −4 opal/browser/support.rb

+16 −8 spec/dom/builder_spec.rb

+0 −4 spec/spec_helper.rb

+1 −1 spec/storage_spec.rb
diff --git a/.travis.yml b/.travis.yml
@@ -35,10 +35,6 @@ env:
 
 matrix:
   allow_failures:
-    # I know these fail
-    - env: SELENIUM_BROWSER=ie SELENIUM_VERSION=6
-    - env: SELENIUM_BROWSER=ie SELENIUM_VERSION=7
-
     # ChromeDriver be broken
     - env: SELENIUM_BROWSER=chrome SELENIUM_VERSION=31
     - env: SELENIUM_BROWSER=chrome SELENIUM_VERSION=30

diff --git a/index.html.erb b/index.html.erb
@@ -14,6 +14,10 @@
       document.body.appendChild(error);
     }
   </script>
+
+  <script src="spec/json2.js"></script>
+  <script src="spec/sizzle.js"></script>
+  <script src="spec/wgxpath.install.js"></script>
 </head>
 <body>
   <%= javascript_include_tag @server.main %>

diff --git a/opal/browser/dom/element.rb b/opal/browser/dom/element.rb
@@ -73,19 +73,45 @@ def attributes(options = {})
     Attributes.new(self, options)
   end
 
-  def get(name, options = {})
-    if namespace = options[:namespace]
-      `#@native.getAttributeNS(#{namespace.to_s}, #{name.to_s}) || nil`
-    else
-      `#@native.getAttribute(#{name.to_s}) || nil`
+  if Browser.supports? 'Element.className'
+    def get(name, options = {})
+      if name == :class
+        name = :className
+      end
+
+      if namespace = options[:namespace]
+        `#@native.getAttributeNS(#{namespace.to_s}, #{name.to_s}) || nil`
+      else
+        `#@native.getAttribute(#{name.to_s}) || nil`
+      end
     end
-  end
 
-  def set(name, value, options = {})
-    if namespace = options[:namespace]
-      `#@native.setAttributeNS(#{namespace.to_s}, #{name.to_s}, #{value})`
-    else
-      `#@native.setAttribute(#{name.to_s}, #{value.to_s})`
+    def set(name, value, options = {})
+      if name == :class
+        name = :className
+      end
+
+      if namespace = options[:namespace]
+        `#@native.setAttributeNS(#{namespace.to_s}, #{name.to_s}, #{value})`
+      else
+        `#@native.setAttribute(#{name.to_s}, #{value.to_s})`
+      end
+    end
+  else
+    def get(name, options = {})
+      if namespace = options[:namespace]
+        `#@native.getAttributeNS(#{namespace.to_s}, #{name.to_s}) || nil`
+      else
+        `#@native.getAttribute(#{name.to_s}) || nil`
+      end
+    end
+
+    def set(name, value, options = {})
+      if namespace = options[:namespace]
+        `#@native.setAttributeNS(#{namespace.to_s}, #{name.to_s}, #{value})`
+      else
+        `#@native.setAttribute(#{name.to_s}, #{value.to_s})`
+      end
     end
   end
 

diff --git a/opal/browser/storage.rb b/opal/browser/storage.rb
@@ -51,7 +51,7 @@ def initialize(window, name)
   # @!attribute [r] encoded_name
   # @return [String] the generated name
   def encoded_name
-    "$opal.storage.#@name"
+    "opal.storage.#@name"
   end
 
   # Check if autosaving is enabled.

diff --git a/opal/browser/support.rb b/opal/browser/support.rb
@@ -1,6 +1,7 @@
-# The engine the browser is running.
+# The engine the browser is running on.
 #
-# Keep in mind it uses the user agent to know, so it's not reliable.
+# Keep in mind it uses the user agent to know, so it's not reliable in case of
+# spoofing.
 BROWSER_ENGINE = `/MSIE|WebKit|Presto|Gecko/.exec(navigator.userAgent)[0]`.downcase rescue :unknown
 
 module Browser
@@ -30,7 +31,7 @@ def self.supports?(feature)
         defined?(`window.ActiveXObject`)
 
       when 'Query.css'
-        defined?(`Element.prototype.querySelectorAll`)
+        defined?(`document.querySelectorAll`)
 
       when 'Query.xpath'
         defined?(`document.evaluate`)
@@ -92,7 +93,23 @@ def self.supports?(feature)
         defined?(`window.pageXOffset`)
 
       when 'Element.addBehavior'
-        defined?(`document.body.addBehavior`)
+        defined?(`document.documentElement.addBehavior`)
+
+      when 'Element.className'
+        %x{
+          var div = document.createElement("div");
+              div.setAttribute('className', 'x');
+
+          return div.className === 'x';
+        }
+
+      when 'Element.class'
+        %x{
+          var div = document.createElement("div");
+              div.setAttribute('class', 'x');
+
+          return div.className === 'x';
+        }
 
       when 'Element.clientSize'
         defined?(`document.documentElement.clientHeight`)

diff --git a/spec/dom/builder_spec.rb b/spec/dom/builder_spec.rb
@@ -2,27 +2,35 @@
 
 describe Browser::DOM::Builder do
   it 'builds an element' do
-    expect(DOM {
+    res = DOM {
       div
-    }.name).to eq('DIV')
+    }
+
+    expect(res.name).to eq('DIV')
   end
 
   it 'builds an element with text content' do
-    expect(DOM {
+    res = DOM {
       div "foo bar"
-    }.text).to eq('foo bar')
+    }
 
-    expect(DOM {
+    expect(res.text).to eq('foo bar')
+
+    res = DOM {
       div {
         "foo bar"
       }
-    }.text).to eq('foo bar')
+    }
+
+    expect(res.text).to eq('foo bar')
   end
 
   it 'builds an element with attributes' do
-    expect(DOM {
+    res = DOM {
       div class: :wut
-    }.class_name).to eq(:wut)
+    }
+
+    expect(res.class_name).to eq(:wut)
   end
 
   it 'builds deeper trees' do

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,7 +1,3 @@
-require 'json2'
-require 'sizzle'
-require 'wgxpath.install'
-
 require 'browser'
 require 'browser/console'
 

diff --git a/spec/storage_spec.rb b/spec/storage_spec.rb
@@ -22,5 +22,5 @@
       expect($window.session_storage.name).to eq(:default)
       expect($window.session_storage(:spec).name).to eq(:spec)
     end
-  end
+  end if Browser::SessionStorage.supported?
 end