From ecd682bb85eeee36057444de7b055090b3468110 Mon Sep 17 00:00:00 2001
From: mrmr1993
Date: Mon, 11 May 2015 02:00:38 +0100
Subject: Use css @import rather than XMLHttpRequest for shadow DOM external
 style

---
 content_scripts/ui_component.coffee    | 7 +------
 content_scripts/vimium_frontend.coffee | 7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)

(limited to 'content_scripts')

diff --git a/content_scripts/ui_component.coffee b/content_scripts/ui_component.coffee
index 61c45136..5e0bd5d5 100644
--- a/content_scripts/ui_component.coffee
+++ b/content_scripts/ui_component.coffee
@@ -8,12 +8,7 @@ class UIComponent
     styleSheet = document.createElement "style"
     styleSheet.type = "text/css"
     # Default to everything hidden while the stylesheet loads.
-    styleSheet.innerHTML = "* {display: none !important;}"
-    # Load stylesheet.
-    xhr = new XMLHttpRequest()
-    xhr.onload = (e) -> styleSheet.innerHTML = xhr.responseText
-    xhr.open "GET", chrome.runtime.getURL("content_scripts/vimium.css"), true
-    xhr.send()
+    styleSheet.innerHTML = "@import url(\"#{chrome.runtime.getURL("content_scripts/vimium.css")}\");"
 
     @iframeElement = document.createElement "iframe"
     extend @iframeElement,
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index 9da99018..d6cc835d 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -336,13 +336,8 @@ window.focusThisFrame = do ->
   # Inject stylesheet.
   _styleSheet = document.createElement "style"
   if _styleSheet.style?
-    _styleSheet.innerHTML = ""
+    _styleSheet.innerHTML = "@import url(\"#{chrome.runtime.getURL("content_scripts/vimium.css")}\");"
     _shadowDOM.appendChild _styleSheet
-    # Load stylesheet.
-    xhr = new XMLHttpRequest()
-    xhr.onload = (e) -> _styleSheet.innerHTML = xhr.responseText
-    xhr.open "GET", chrome.runtime.getURL("content_scripts/vimium.css"), true
-    xhr.send()
 
   _frameEl = document.createElement "div"
   _frameEl.className = "vimiumReset vimiumHighlightedFrame"
-- 
cgit v1.2.3