aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/styles-controller.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/controllers/styles-controller.js')
-rwxr-xr-xjs/controllers/styles-controller.js19
1 files changed, 14 insertions, 5 deletions
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index 5d5f27ba..3e56f25c 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -94,11 +94,18 @@ var stylesController = exports.StylesController = Montage.create(Component, {
94 // Returns null if sheet not found (as in non-ninja projects) 94 // Returns null if sheet not found (as in non-ninja projects)
95 // Setter will handle null case 95 // Setter will handle null case
96 this.defaultStylesheet = this.getSheetFromElement(this.CONST.DEFAULT_SHEET_ID); 96 this.defaultStylesheet = this.getSheetFromElement(this.CONST.DEFAULT_SHEET_ID);
97 97
98 //debugger; 98 this.userStyleSheets = nj.toArray(document._document.styleSheets).filter(function(sheet) {
99 return sheet !== this._stageStylesheet;
100 }, this);
101
102 NJevent('styleSheetsReady', this);
99 }, 103 },
100 enumerable : false 104 enumerable : false
101 }, 105 },
106 userStyleSheets : {
107 value : null
108 },
102 _stageStylesheet : { 109 _stageStylesheet : {
103 value : null 110 value : null
104 }, 111 },
@@ -183,6 +190,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
183 ///// attach specificity to rule object 190 ///// attach specificity to rule object
184 ///// if rule is css keyframes, return rule and don't attach specificity 191 ///// if rule is css keyframes, return rule and don't attach specificity
185 if (rule instanceof WebKitCSSKeyframesRule) { 192 if (rule instanceof WebKitCSSKeyframesRule) {
193
186 return rule; 194 return rule;
187 } 195 }
188 rule[this.CONST.SPECIFICITY_KEY] = this.getSpecificity(rule.selectorText); 196 rule[this.CONST.SPECIFICITY_KEY] = this.getSpecificity(rule.selectorText);
@@ -1241,6 +1249,8 @@ var stylesController = exports.StylesController = Montage.create(Component, {
1241 1249
1242 this.styleSheetModified(sheet); 1250 this.styleSheetModified(sheet);
1243 1251
1252 NJevent('newStyleSheet', sheet);
1253
1244 return sheet; 1254 return sheet;
1245 } 1255 }
1246 }, 1256 },
@@ -1303,11 +1313,10 @@ var stylesController = exports.StylesController = Montage.create(Component, {
1303 this.dirtyStyleSheets.length = 0; 1313 this.dirtyStyleSheets.length = 0;
1304 1314
1305 if(doc) { 1315 if(doc) {
1306 var stillDirty = this.dirtyStyleSheets.filter(function(sheet) { 1316 this.dirtyStyleSheets = null;
1317 this.dirtyStyleSheets = this.dirtyStyleSheets.filter(function(sheet) {
1307 return sheet.document !== doc; 1318 return sheet.document !== doc;
1308 }); 1319 });
1309 this.dirtyStyleSheets = null;
1310 this.dirtyStyleSheets = stillDirty;
1311 } 1320 }
1312 1321
1313 1322