Merge pull request #341 from ericguzman/Chrome20_CSS_Workaround

Styles Controller - Chrome 20 Fix

2 files changed, 52 insertions, 29 deletions

diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index 1c1e75ed..0f847653 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -604,51 +604,74 @@ var stylesController = exports.StylesController = Montage.create(Component, {
     
     getRuleIndex : {
         value : function(rule) {
-            var rules = nj.toArray(rule.parentStyleSheet.rules),
-                i;
+            var rules = nj.toArray(rule.parentStyleSheet.rules);
 
             return rules.indexOf(rule);
         }
     },
-    
+
+    _getRuleWithCSSText : {
+        value: function(cssText, doc) {
+            var _doc = doc || this.currentDocument.model.views.design._document,
+                ruleIndex, rule;
+
+            for(var i = 0; i < _doc.styleSheets.length; i++) {
+                ruleIndex = nj.toArray(_doc.styleSheets[i].rules).map(function(rule) {
+                    return rule.cssText;
+                }).indexOf(cssText);
+
+                if(ruleIndex !== -1) {
+                    rule = _doc.styleSheets[i].rules[ruleIndex];
+                    break;
+                }
+            }
+
+            if(!rule) {
+                ///// This should never be hit if providing cssText from existing rule (like those
+                ///// returned from getMatchedCSSRules()
+                console.warn('StylesController::_getRuleWithCSSText - No rule found with given cssText.');
+            }
+
+            return rule;
+        }
+    },
+
     ///// Get All Matching Rules
     ///// Returns an array of css rules for an element
     ///// Optionally sorted by specificity, and can omit pseudo elements
     
-    getMatchingRules : {
+    getMatchingRules : {          //TODO: Remove omitPseudos from here and usages
         value: function(element, omitPseudos, useStageStyleSheet) {
-            var pseudos = [null],
-                rules = [],
-                win = element.ownerDocument.defaultView,
-                self = this;
-
-            if(!omitPseudos) {
-                pseudos.concat(['link', 'visited', 'active', 'hover', 'focus', 'first-letter', 
-                                'first-line', 'first-child', 'before', 'after', 'lang', 'target']);
-            }
+            var rules,
+                mappedRules,
+                doc = element.ownerDocument,
+                win = doc.defaultView;
 
             try {
-                pseudos.forEach(function(pseudo) {
-                    rules = rules.concat(nj.toArray(win.getMatchedCSSRules(element, pseudo)).filter(function(rule) {
-                        //// useStageStyleSheet flag indicates whether to only return rules from the stylesheet,
-                        //// or only use rules for other stylesheets
+                mappedRules = nj.toArray(win.getMatchedCSSRules(element)).map(function(rule) {
+                    return this._getRuleWithCSSText(rule.cssText, doc);
+                }, this);
 
-                        var sheetId = (rule.parentStyleSheet) ? rule.parentStyleSheet.ownerNode.id : null,
-                            isStageStyleSheet = sheetId === this.CONST.STAGE_SHEET_ID;
+                rules = mappedRules.filter(function(rule) {
+                    //// useStageStyleSheet flag indicates whether to only return rules from the stylesheet,
+                    //// or only use rules for other stylesheets
 
-                        ///// filter out (return false) depending on flag
-                        if(useStageStyleSheet && !isStageStyleSheet) { return false; }
-                        if(!useStageStyleSheet && isStageStyleSheet) { return false; }
+                    var sheetId = (rule.parentStyleSheet) ? rule.parentStyleSheet.ownerNode.id : null,
+                        isStageStyleSheet = sheetId === this.CONST.STAGE_SHEET_ID;
 
-                        ///// Non-filter code - just assigning specificity to the rule
-                        if(!rule[this.CONST.SPECIFICITY_KEY]) {
-                            rule[this.CONST.SPECIFICITY_KEY] = this.getSpecificity(rule.selectorText);
-                        }
+                    ///// filter out (return false) depending on flag
+                    if(useStageStyleSheet && !isStageStyleSheet) { return false; }
+                    if(!useStageStyleSheet && isStageStyleSheet) { return false; }
 
-                        return true;
+                    ///// Non-filter code - just assigning specificity to the rule
+                    if(!rule[this.CONST.SPECIFICITY_KEY]) {
+                        rule[this.CONST.SPECIFICITY_KEY] = this.getSpecificity(rule.selectorText);
+                    }
+
+                    return true;
 
-                    }, this));
                 }, this);
+
             } catch(ERROR) {
                 console.warn('StylesController::getMatchingRules - Un-attached element queried.');
             }
diff --git a/js/panels/css-panel/rule-list.reel/rule-list.js b/js/panels/css-panel/rule-list.reel/rule-list.js
index 27d74b2f..b4cd9e97 100644
--- a/js/panels/css-panel/rule-list.reel/rule-list.js
+++ b/js/panels/css-panel/rule-list.reel/rule-list.js
@@ -81,7 +81,7 @@ exports.RuleList = Montage.create(Component, {
                     // found rule in our component list, or it's the inline rule
                     ruleComponent.update();
                     foundIndices.push(index);
-                } else if(!rule.applied) { /// remove rule (unless unapplied)
+                } else if(!ruleComponent.applied) { /// remove rule (unless unapplied)
                     this.rulesToRemove.push(ruleComponent);
                 }
             }, this);