diff options
author | Eric Guzman | 2012-07-20 11:30:08 -0700 |
---|---|---|
committer | Eric Guzman | 2012-07-20 11:30:08 -0700 |
commit | 2f0c50a13258e8abb9325573ed7e0ebe11655fec (patch) | |
tree | f5c42b78d2d5f63c45a53590d56bfc6344cc8068 /js/panels | |
parent | 9053e2037821a5c8405fabb74db9635deacfe8d5 (diff) | |
download | ninja-2f0c50a13258e8abb9325573ed7e0ebe11655fec.tar.gz |
CSS Panel - Fix updating when media changes, sheets are deleted.
Diffstat (limited to 'js/panels')
3 files changed, 7 insertions, 2 deletions
diff --git a/js/panels/css-panel/rule-list.reel/rule-list.js b/js/panels/css-panel/rule-list.reel/rule-list.js index ae0c4611..b9dc2b95 100644 --- a/js/panels/css-panel/rule-list.reel/rule-list.js +++ b/js/panels/css-panel/rule-list.reel/rule-list.js | |||
@@ -106,7 +106,7 @@ exports.RuleList = Montage.create(Component, { | |||
106 | // found rule in our component list, or it's the inline rule | 106 | // found rule in our component list, or it's the inline rule |
107 | ruleComponent.update(); | 107 | ruleComponent.update(); |
108 | foundIndices.push(index); | 108 | foundIndices.push(index); |
109 | } else if(!ruleComponent.applied) { /// remove rule (unless unapplied) | 109 | } else if(ruleComponent.applied) { /// remove rule (unless unapplied) |
110 | this.rulesToRemove.push(ruleComponent); | 110 | this.rulesToRemove.push(ruleComponent); |
111 | } | 111 | } |
112 | }, this); | 112 | }, this); |
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 cd86261c..2effb429 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 | |||
@@ -141,7 +141,6 @@ exports.StyleSheetsView = Montage.create(Component, { | |||
141 | handleDeleteAction : { | 141 | handleDeleteAction : { |
142 | value: function(sheetComponent) { | 142 | value: function(sheetComponent) { |
143 | this.stylesController.removeStyleSheet(sheetComponent.source); | 143 | this.stylesController.removeStyleSheet(sheetComponent.source); |
144 | this.stylesController._clearCache(); | ||
145 | this._dispatchChange(); | 144 | this._dispatchChange(); |
146 | } | 145 | } |
147 | }, | 146 | }, |
diff --git a/js/panels/css-panel/styles-view-container.reel/styles-view-container.js b/js/panels/css-panel/styles-view-container.reel/styles-view-container.js index bba178f2..94abb4b0 100644 --- a/js/panels/css-panel/styles-view-container.reel/styles-view-container.js +++ b/js/panels/css-panel/styles-view-container.reel/styles-view-container.js | |||
@@ -141,6 +141,12 @@ exports.StylesViewContainer = Montage.create(Component, { | |||
141 | value: function() { | 141 | value: function() { |
142 | this.eventManager.addEventListener('styleSheetsReady', this, false); | 142 | this.eventManager.addEventListener('styleSheetsReady', this, false); |
143 | this.eventManager.addEventListener('elementChange', this, false); | 143 | this.eventManager.addEventListener('elementChange', this, false); |
144 | this.eventManager.addEventListener('mediaChange', this, false); | ||
145 | } | ||
146 | }, | ||
147 | handleMediaChange : { | ||
148 | value: function(e) { | ||
149 | this.ruleListContainer.update(); | ||
144 | } | 150 | } |
145 | }, | 151 | }, |
146 | handleStyleSheetsReady: { | 152 | handleStyleSheetsReady: { |