add shim support for scope styles

googlearchive · Mar 7, 2014 · 55e5fd7 · 55e5fd7
1 parent a867522
commit 55e5fd7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/src/declaration/styles.js b/src/declaration/styles.js
@@ -181,6 +181,9 @@
 
   function applyStyleToScope(style, scope) {
     if (style) {
+      if (window.ShadowDOMPolyfill) {
+        scope = document.head;
+      }
       // TODO(sorvell): necessary for IE
       // see https://connect.microsoft.com/IE/feedback/details/790212/
       // cloning-a-style-element-and-adding-to-document-produces

diff --git a/src/instance/styles.js b/src/instance/styles.js
@@ -57,7 +57,7 @@
         return;
       }
       if (window.ShadowDOMPolyfill) {
-        cssText = shimCssText(cssText, scope);
+        cssText = shimCssText(cssText, scope.host);
       }
       var style = this.element.cssTextToScopeStyle(cssText,
           STYLE_CONTROLLER_SCOPE);
@@ -66,16 +66,12 @@
       scope._scopeStyles[this.localName + name] = true;
     },
     findStyleScope: function() {
-      if (window.ShadowDOMPolyfill) {
-        return wrap(document.head);
-      } else {
-        // find the shadow root that contains this element
-        var n = this;
-        while (n.parentNode) {
-          n = n.parentNode;
-        }
-        return n === document ? document.head : n;
+      // find the shadow root that contains this element
+      var n = this;
+      while (n.parentNode) {
+        n = n.parentNode;
       }
+      return n;
     },
     scopeHasNamedStyle: function(scope, name) {
       scope._scopeStyles = scope._scopeStyles || {};
@@ -89,12 +85,13 @@
     return prototype.__proto__;
   }
 
-  function shimCssText(cssText, scope) {
-    if (scope === document.head) {
-      return cssText;
+  function shimCssText(cssText, host) {
+    var name = '', is = false;
+    if (host) {
+      name = host.localName;
+      is = host.hasAttribute('is');
     }
-    var selector = Platform.ShadowCSS.makeScopeSelector(scope.localName, 
-        scope.hasAttribute('is'));
+    var selector = Platform.ShadowCSS.makeScopeSelector(name, is);
     return Platform.ShadowCSS.shimCssText(cssText, selector);
   }