Fix normalizeRootSelector

Remove crazy `runtime` switch in `whenHostOrRootRules` Fix tests with takeRecords
Polymer · Sep 23, 2016 · c2278a0 · c2278a0
1 parent dd786fd
commit c2278a0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/src/lib/style-properties.html b/src/lib/style-properties.html
@@ -35,7 +35,7 @@
           self.decorateRule(rule);
           // mark in-order position of ast rule in styles block, used for cache key
           rule.index = ruleIndex++;
-          self.whenHostOrRootRule(scope, rule, style, false, function(info) {
+          self.whenHostOrRootRule(scope, rule, style, function(info) {
             // we can't cache styles with :host and :root props in @media rules
             if (rule.parent.type === styleUtil.ruleTypes.MEDIA_RULE) {
               scope.__notStyleScopeCacheable = true;
@@ -285,19 +285,15 @@
         return {properties: props, key: o};
       },
 
-      whenHostOrRootRule: function(scope, rule, style, runtime, callback) {
+      whenHostOrRootRule: function(scope, rule, style, callback) {
         if (!rule.propertyInfo) {
           self.decorateRule(rule);
         }
         if (!rule.propertyInfo.properties) {
           return;
         }
         var checkRoot = function(hostScope, selector) {
-          if (runtime) {
-            return selector.indexOf(':root') === 0 || (hostScope === 'html' && parsedSelector.indexOf('html') === 0);
-          } else {
-            return selector === ':root' || selector === 'html';
-          }
+          return selector.indexOf(':root') === 0 || (hostScope === 'html' && selector.indexOf('html') === 0);
         };
         var hostScope = scope.is ?
         styleTransformer._calcHostScope(scope.is, scope.extends) :
@@ -338,7 +334,7 @@
           // parsedSelector fallback for 'shady' css build
           selectorToMatch = rule.transformedSelector || rule.parsedSelector;
         }
-        if (isRoot && runtime && hostScope === 'html') {
+        if (isRoot && hostScope === 'html') {
           selectorToMatch = rule.transformedSelector || rule.parsedSelector;
         }
         callback({
@@ -353,7 +349,7 @@
         // note: active rules excludes non-matching @media rules
         styleUtil.forActiveRulesInStyles(scope._styles, function(rule, style) {
           // if scope is StyleDefaults, use _element for matchesSelector
-          self.whenHostOrRootRule(scope, rule, style, true, function(info) {
+          self.whenHostOrRootRule(scope, rule, style, function(info) {
             var element = scope._element || scope;
             if (matchesSelector.call(element, info.selector)) {
               if (info.isHost) {

diff --git a/src/lib/style-transformer.html b/src/lib/style-transformer.html
@@ -289,9 +289,7 @@
       },
 
       normalizeRootSelector: function(rule) {
-        if (rule.selector === ROOT) {
-          rule.selector = 'html';
-        }
+        rule.selector = rule.selector.replace(ROOT, 'html');
       },
 
       _transformDocumentSelector: function(selector) {

diff --git a/test/unit/custom-style.html b/test/unit/custom-style.html
@@ -571,6 +571,7 @@
         var el;
         function activateSelectors() {
           document.documentElement.setAttribute('foo', 'bar');
+          CustomElements.takeRecords();
           Polymer.updateStyles();
         }
         suiteSetup(function() {
@@ -579,6 +580,7 @@
         });
         teardown(function() {
           document.documentElement.removeAttribute('foo');
+          CustomElements.takeRecords();
           Polymer.updateStyles();
         });
         test(':root...', function() {