Merge pull request #1717 from lablup/master

Fix for IE.
Polymer · Jun 4, 2015 · 896a04b · 896a04b
2 parents b8ffcdd + 1f3b4ea
commit 896a04b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/lib/custom-style.html b/src/lib/custom-style.html
@@ -107,7 +107,7 @@
             rule.selector = 'body';
           }
           var css = rule.cssText = rule.parsedCssText;
-          if (rule.propertyInfo.cssText) {
+          if (rule.propertyInfo && rule.propertyInfo.cssText) {
             // TODO(sorvell): factor better
             // remove property assignments so next function isn't confused
             css = css.replace(propertyUtils.rx.VAR_ASSIGN, '');

diff --git a/src/lib/style-properties.html b/src/lib/style-properties.html
@@ -165,7 +165,7 @@
       applyProperties: function(rule, props) {
         var output = '';
         // dynamically added sheets may not be decorated so ensure they are.
-        if (!rule.properties) {
+        if (!rule.propertyInfo) {
           this.decorateRule(rule);
         }
         if (rule.propertyInfo.cssText) {
@@ -349,4 +349,4 @@
 
   })();
 
-</script>
+</script>