1 files changed, 17 insertions, 6 deletions

diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index ec4314f9..3422427c 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -94,11 +94,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
     },
@@ -183,6 +190,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);
@@ -795,7 +803,9 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             ///// method to apply/test the new value
             dec.setProperty(property, value, priority);
 
-            this.styleSheetModified(rule.parentStyleSheet);
+            if(rule.parentStyleSheet) {
+                this.styleSheetModified(rule.parentStyleSheet);
+            }
 
             ///// Return browser value for value we just set
             return dec.getPropertyValue(property);
@@ -1244,6 +1254,8 @@ var stylesController = exports.StylesController = Montage.create(Component, {
 
             this.styleSheetModified(sheet);
 
+            NJevent('newStyleSheet', sheet);
+
             return sheet;
         }
     },
@@ -1306,11 +1318,10 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             this.dirtyStyleSheets.length = 0;
 
             if(doc) {
-                var stillDirty = this.dirtyStyleSheets.filter(function(sheet) {
+                this.dirtyStyleSheets = null;
+                this.dirtyStyleSheets = this.dirtyStyleSheets.filter(function(sheet) {
                     return sheet.document !== doc;
                 });
-                this.dirtyStyleSheets = null;
-                this.dirtyStyleSheets = stillDirty;
             }