Merge branch 'pentool' into brushtool

1 files changed, 22 insertions, 22 deletions

diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index 885d710f..662816f5 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -317,7 +317,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
                     isInlineStyle : true,
                     style         : element.style
                 };
-                
+
                 ///// Now splice it into the matched rules
                 ///// By inserting the inline style at the beginning,
                 ///// we keep the correct order of specificity
@@ -572,37 +572,36 @@ var stylesController = exports.StylesController = Montage.create(Component, {
                 win = element.ownerDocument.defaultView,
                 self = this;
 
-            if(!win) {
-                return null;
-            }
-                
             if(!omitPseudos) {
                 pseudos.concat(['link', 'visited', 'active', 'hover', 'focus', 'first-letter', 
                                 'first-line', 'first-child', 'before', 'after', 'lang', 'target']);
             }
 
-            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
-
-                    var sheetId = (rule.parentStyleSheet) ? rule.parentStyleSheet.ownerNode.id : null,
-                        isStageStyleSheet = sheetId === this.CONST.STAGE_SHEET_ID;
+            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
 
-                    ///// 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);
+                        }
 
-                }, this));
-            }, this);
+                        return true;
 
+                    }, this));
+                }, this);
+            } catch(ERROR) {
+                console.warn('StylesController::getMatchingRules - Un-attached element queried.');
+            }
             ///// Function for sorting by specificity values
             function sorter(ruleA, ruleB) {
                 var a, b, order, sheetAIndex, sheetBIndex, ruleAIndex, ruleBIndex;
@@ -981,6 +980,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
                 ///// Pass "true" to method to return an override object, which
                 ///// has the rule to override, and whether the !important flag is needed
                 dominantRule = this.getDominantRuleForElement(element, property, true, isStageElement);
+
             }
                
             ///// Did we find a dominant rule?