diff options
Diffstat (limited to 'js/controllers')
-rwxr-xr-x | js/controllers/styles-controller.js | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js index 662816f5..d36c8cb9 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); |
@@ -1177,6 +1185,8 @@ var stylesController = exports.StylesController = Montage.create(Component, { | |||
1177 | 1185 | ||
1178 | this.styleSheetModified(sheet); | 1186 | this.styleSheetModified(sheet); |
1179 | 1187 | ||
1188 | NJevent('newStyleSheet', sheet); | ||
1189 | |||
1180 | return sheet; | 1190 | return sheet; |
1181 | } | 1191 | } |
1182 | }, | 1192 | }, |
@@ -1236,11 +1246,16 @@ var stylesController = exports.StylesController = Montage.create(Component, { | |||
1236 | 1246 | ||
1237 | clearDirtyStyleSheets : { | 1247 | clearDirtyStyleSheets : { |
1238 | value: function(doc) { | 1248 | value: function(doc) { |
1239 | if(!doc) { | 1249 | this.dirtyStyleSheets.length = 0; |
1250 | |||
1251 | if(doc) { | ||
1240 | this.dirtyStyleSheets = null; | 1252 | this.dirtyStyleSheets = null; |
1241 | this.dirtyStyleSheets = []; | 1253 | this.dirtyStyleSheets = this.dirtyStyleSheets.filter(function(sheet) { |
1254 | return sheet.document !== doc; | ||
1255 | }); | ||
1242 | } | 1256 | } |
1243 | 1257 | ||
1258 | |||
1244 | } | 1259 | } |
1245 | }, | 1260 | }, |
1246 | 1261 | ||