1 files changed, 64 insertions, 16 deletions

diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index 2ff3e235..c8b9376e 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -83,6 +83,11 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             ///// If the document is null set default stylesheets to null
 
             if(!document) {
+                this._activeDocument   = null;
+                this._stageStylesheet  = null;
+                this.defaultStylesheet = null;
+                this.userStyleSheets   = [];
+                this.clearDirtyStyleSheets();
                 return false;
             }
 
@@ -94,11 +99,18 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             // Returns null if sheet not found (as in non-ninja projects)
             // Setter will handle null case
             this.defaultStylesheet = this.getSheetFromElement(this.CONST.DEFAULT_SHEET_ID);
-                        
-            //debugger;
+
+            this.userStyleSheets = nj.toArray(document._document.styleSheets).filter(function(sheet) {
+                return sheet !== this._stageStylesheet;
+            }, this);
+
+            NJevent('styleSheetsReady', this);
         },
         enumerable : false
     },
+    userStyleSheets : {
+        value : null
+    },
     _stageStylesheet : {
         value : null
     },
@@ -113,7 +125,10 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             if(sheet) {
                 this._defaultStylesheet = sheet;
             } else {
-                
+                if(sheet === null) {
+                    this._defaultStylesheet = null;
+                    return false;
+                }
                 ///// Use the last stylesheet in the document as the default
                 
                 var sheets = this._activeDocument._document.styleSheets,
@@ -183,6 +198,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             ///// attach specificity to rule object
             ///// if rule is css keyframes, return rule and don't attach specificity
             if (rule instanceof WebKitCSSKeyframesRule) {
+
                 return rule;
             }
             rule[this.CONST.SPECIFICITY_KEY] = this.getSpecificity(rule.selectorText);
@@ -209,10 +225,12 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             }
 
             var selectorToOverride = getSelector.bind(this)(element, ruleToOverride),
-                overrideData, rule;
+                overrideData, rule, isRuleLocked;
+
+            isRuleLocked = this.isSheetLocked(ruleToOverride.parentStyleSheet);
 
             ///// Get the overriding selector and className
-            overrideData = this.createOverrideSelector(selectorToOverride, element.nodeName);
+            overrideData = this.createOverrideSelector(selectorToOverride, element.nodeName, isRuleLocked);
 
             ///// Create new rule with selector and insert it after the rule we're overriding
             rule = this.addRule(overrideData.selector + ' { }', this.getRuleIndex(ruleToOverride)+1);
@@ -226,7 +244,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
     },
 
     createOverrideSelector : {
-        value: function(selectorToOverride, classPrefix, className) {
+        value: function(selectorToOverride, classPrefix, increaseSpecificity, className) {
             var tokens = selectorToOverride.split(/\s/),
                 newClass = className || this.generateClassName(classPrefix, true),
                 lastToken, pseudoSplit, base, pseudo, newToken, newSelector;
@@ -247,10 +265,19 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             if(base.indexOf('#') !== -1) {
                 newToken = base + '.' + newClass + pseudo;
             } else {
-                ///// Replace last class or attribute selector
-                ///// Get everything right before the last class or attribute selector
-                ///// to support compound selector values: (i.e. .firstClass.secondClass)
-                newToken = base.substring(0, Math.max(base.lastIndexOf('.'), base.lastIndexOf('[')));
+                if(increaseSpecificity) {
+                    ///// Increases specificity by one class selector
+                    ///// We'll do a direct append to the base class
+                    ///// if we want to increase the specificity
+                    newToken = base;
+                } else {
+                    ///// Maintains original specificity
+                    ///// Replace last class or attribute selector
+                    ///// Get everything right before the last class or attribute selector
+                    ///// to support compound selector values: (i.e. .firstClass.secondClass)
+                    newToken = base.substring(0, Math.max(base.lastIndexOf('.'), base.lastIndexOf('[')));
+                }
+
                 ///// Append the generated class
                 newToken += '.' + newClass + pseudo;
             }
@@ -971,12 +998,13 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             var doc = element.ownerDocument,
                 useImportant = false,
                 cache = this._getCachedRuleForProperty(element, property),
-                dominantRule, override, className, browserValue;
+                dominantRule, override, className, browserValue, cacheMatchesMany;
 
             if(cache) {
                 ///// We've cached the rule for this property!
                 //console.log('Styles Controller :: setElementStyle - We found the cached rule!');
                 dominantRule = cache;
+                cacheMatchesMany = this.matchesMultipleElements(dominantRule, doc);
             } else {
                 ///// Use Dominant Rule logic to find the right place to add the style
                 ///// Pass "true" to method to return an override object, which
@@ -984,7 +1012,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
                 dominantRule = this.getDominantRuleForElement(element, property, true, isStageElement);
 
             }
-               
+
             ///// Did we find a dominant rule?
             if(!dominantRule) {
                 ///// No. This means there was no rule with this property, and no
@@ -1002,6 +1030,13 @@ var stylesController = exports.StylesController = Montage.create(Component, {
                 useImportant = dominantRule.useImportant;
                 dominantRule = override.rule;
                 this.addClass(element, override.className);
+            } else if(cacheMatchesMany) {
+                ///// Only happens when the cached rule applies to multiple
+                ///// elements - we must create override
+                override = this.createOverrideRule(dominantRule, element);
+                useImportant = !!dominantRule.style.getPropertyPriority(property);
+                dominantRule = override.rule;
+                this.addClass(element, override.className);
             }
 
 
@@ -1009,7 +1044,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             browserValue = this.setStyle(dominantRule, property, value, useImportant);
 
             ///// Only cache the dominant rule if the style value was valid, and not already cached
-            if(browserValue && !cache) {
+            if(browserValue && (!cache || cacheMatchesMany)) {
                 this._setCachedRuleForProperty(element, property, dominantRule);
             }
 
@@ -1244,8 +1279,12 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             doc.head.appendChild(sheetElement);
             sheet = this.getSheetFromElement(sheetElement, doc);
 
+            this.userStyleSheets.push(sheet);
+
             this.styleSheetModified(sheet);
 
+            NJevent('newStyleSheet', sheet);
+
             return sheet;
         }
     },
@@ -1268,6 +1307,12 @@ var stylesController = exports.StylesController = Montage.create(Component, {
         }
     },
 
+    isSheetLocked : {
+        value: function(sheet) {
+            return !!sheet.ownerNode.dataset['ninjaFileReadOnly'];
+        }
+    },
+
     ///// Style Sheet Modified
     ///// Method to call whenever a stylesheet change is made
     ///// Dispatches an event, and keeps list of dirty style sheets
@@ -1278,6 +1323,9 @@ var stylesController = exports.StylesController = Montage.create(Component, {
                 return sheetObj.stylesheet === sheet;
             });
 
+            ///// Dispatch modified event
+            NJevent('styleSheetModified', eventData);
+
             ///// If the sheet doesn't already exist in the list of modified