diff options
author | Eric Guzman | 2012-07-20 11:39:51 -0700 |
---|---|---|
committer | Eric Guzman | 2012-07-20 11:39:51 -0700 |
commit | c85a4fc8001b50bebc60d05277df0264c61879c2 (patch) | |
tree | 2faaf3d49337437e4a84818fe24dc64a60f8c611 /js/panels/css-panel/style-sheets-view.reel | |
parent | 2f0c50a13258e8abb9325573ed7e0ebe11655fec (diff) | |
parent | 3cc29231852440508bdeec1964e40ce59f979f99 (diff) | |
download | ninja-c85a4fc8001b50bebc60d05277df0264c61879c2.tar.gz |
Merge branch 'refs/heads/fixes_7.1' into minorFixes_7.1
Diffstat (limited to 'js/panels/css-panel/style-sheets-view.reel')
-rw-r--r-- | js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js b/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js index 2effb429..fd559b24 100644 --- a/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js +++ b/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js | |||
@@ -96,13 +96,16 @@ exports.StyleSheetsView = Montage.create(Component, { | |||
96 | 96 | ||
97 | var sheetComponent, oldDefaultSheet; | 97 | var sheetComponent, oldDefaultSheet; |
98 | 98 | ||
99 | ///// Mark the appropriate component as the default, un-mark the previous default | ||
99 | if(this.styleSheetList) { | 100 | if(this.styleSheetList) { |
100 | sheetComponent = this.styleSheetList.childComponents[this.styleSheets.indexOf(sheet)]; | 101 | sheetComponent = this.styleSheetList.childComponents[this.styleSheets.indexOf(sheet)]; |
101 | if(sheetComponent) { | 102 | if(sheetComponent) { |
102 | sheetComponent['default'] = true; | 103 | sheetComponent['default'] = true; |
103 | if(this._defaultStyleSheet) { | 104 | if(this._defaultStyleSheet) { |
104 | oldDefaultSheet = this.styleSheetList.childComponents[this.styleSheets.indexOf(this._defaultStyleSheet)]; | 105 | oldDefaultSheet = this.styleSheetList.childComponents[this.styleSheets.indexOf(this._defaultStyleSheet)]; |
105 | oldDefaultSheet['default'] = false; | 106 | if(oldDefaultSheet) { |
107 | oldDefaultSheet['default'] = false; | ||
108 | } | ||
106 | } | 109 | } |
107 | } | 110 | } |
108 | } | 111 | } |
@@ -175,7 +178,7 @@ exports.StyleSheetsView = Montage.create(Component, { | |||
175 | } | 178 | } |
176 | }, | 179 | }, |
177 | 180 | ||
178 | handleStyleSheetModified : { | 181 | handleStyleSheetDirty : { |
179 | value: function(e) { | 182 | value: function(e) { |
180 | this.needsDraw = true; | 183 | this.needsDraw = true; |
181 | } | 184 | } |
@@ -192,7 +195,7 @@ exports.StyleSheetsView = Montage.create(Component, { | |||
192 | prepareForDraw : { | 195 | prepareForDraw : { |
193 | value: function() { | 196 | value: function() { |
194 | this.eventManager.addEventListener("styleSheetsReady", this, false); | 197 | this.eventManager.addEventListener("styleSheetsReady", this, false); |
195 | this.eventManager.addEventListener("styleSheetModified", this, false); | 198 | this.eventManager.addEventListener("styleSheetDirty", this, false); |
196 | } | 199 | } |
197 | }, | 200 | }, |
198 | draw : { | 201 | draw : { |