Merge pull request #1798 from gdh1995/run-on-xml-pages

Run on XML pages (version 2)

3 files changed, 18 insertions, 11 deletions

diff --git a/lib/clipboard.coffee b/lib/clipboard.coffee
index 5041cf49..f0fb83b1 100644
--- a/lib/clipboard.coffee
+++ b/lib/clipboard.coffee
@@ -1,6 +1,6 @@
 Clipboard =
   _createTextArea: ->
-    textArea = document.createElement("textarea")
+    textArea = document.createElement "textarea"
     textArea.style.position = "absolute"
     textArea.style.left = "-100%"
     textArea
diff --git a/lib/dom_utils.coffee b/lib/dom_utils.coffee
index d4f5953d..ad88deae 100644
--- a/lib/dom_utils.coffee
+++ b/lib/dom_utils.coffee
@@ -8,12 +8,25 @@ DomUtils =
     else
       func()
 
+  createElement: (tagName) ->
+    element = document.createElement tagName
+    if element instanceof HTMLElement
+      # The document namespace provides (X)HTML elements, so we can use them directly.
+      @createElement = (tagName) -> document.createElement tagName
+      element
+    else
+      # The document namespace doesn't give (X)HTML elements, so we create them with the correct namespace
+      # manually.
+      @createElement = (tagName) ->
+        document.createElementNS "http://www.w3.org/1999/xhtml", tagName
+      @createElement(tagName)
+
   #
   # Adds a list of elements to a page.
   # Note that adding these nodes all at once (via the parent div) is significantly faster than one-by-one.
   #
   addElementList: (els, overlayOptions) ->
-    parent = document.createElement("div")
+    parent = @createElement "div"
     parent.id = overlayOptions.id if overlayOptions.id?
     parent.className = overlayOptions.className if overlayOptions.className?
     parent.appendChild(el) for el in els
@@ -236,7 +249,7 @@ DomUtils =
 
   # momentarily flash a rectangular border to give user some visual feedback
   flashRect: (rect) ->
-    flashEl = document.createElement("div")
+    flashEl = @createElement "div"
     flashEl.id = "vimiumFlash"
     flashEl.className = "vimiumReset"
     flashEl.style.left = rect.left + window.scrollX + "px"
@@ -297,7 +310,7 @@ DomUtils =
       'letterSpacing', 'wordSpacing' ]
 
     (element, position) ->
-      div = document.createElement "div"
+      div = @createElement "div"
       div.id = "vimium-input-textarea-caret-position-mirror-div"
       document.body.appendChild div
 
@@ -315,7 +328,7 @@ DomUtils =
       if element.nodeName.toLowerCase() == "input"
         div.textContent = div.textContent.replace /\s/g, "\u00a0"
 
-      span = document.createElement "span"
+      span = @createElement "span"
       span.textContent = element.value.substring(position) || "."
       div.appendChild span
 
diff --git a/lib/utils.coffee b/lib/utils.coffee
index d4beff03..90469fad 100644
--- a/lib/utils.coffee
+++ b/lib/utils.coffee
@@ -19,12 +19,6 @@ Utils =
     func = obj[components.pop()]
     func.apply(obj, argArray)
 
-  # Creates a single DOM element from :html
-  createElementFromHtml: (html) ->
-    tmp = document.createElement("div")
-    tmp.innerHTML = html
-    tmp.firstChild
-
   escapeHtml: (string) -> string.replace(/</g, "&lt;").replace(/>/g, "&gt;")
 
   # Generates a unique ID