diff options
author | Kruti Shah | 2012-07-03 10:08:44 -0700 |
---|---|---|
committer | Kruti Shah | 2012-07-03 10:08:44 -0700 |
commit | bf5e6d6febf0c15a00e7694d7fa2c85b0cf567fe (patch) | |
tree | 006f6243962aa2e2b59f688cf37b16162376dc39 /js/panels/css-panel/styles-view-delegate.js | |
parent | 3aa1242147264351b7d827fa25ecb5dc42bc2fb0 (diff) | |
parent | 12de4e49a309e210c13eb40b2ffa158ef2eb54a7 (diff) | |
download | ninja-bf5e6d6febf0c15a00e7694d7fa2c85b0cf567fe.tar.gz |
Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/panels/css-panel/styles-view-delegate.js')
-rw-r--r-- | js/panels/css-panel/styles-view-delegate.js | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/js/panels/css-panel/styles-view-delegate.js b/js/panels/css-panel/styles-view-delegate.js index a7c1f0d9..4f41ff12 100644 --- a/js/panels/css-panel/styles-view-delegate.js +++ b/js/panels/css-panel/styles-view-delegate.js | |||
@@ -171,7 +171,8 @@ exports.StylesViewDelegate = Montage.create(Component, { | |||
171 | }, | 171 | }, |
172 | handlePropertyChange : { | 172 | handlePropertyChange : { |
173 | value: function(rule, property, value, oldProperty, style) { | 173 | value: function(rule, property, value, oldProperty, style) { |
174 | var browserValue; | 174 | var declaration = style.parentComponent.parentComponent, |
175 | browserValue; | ||
175 | 176 | ||
176 | if(style.editingNewStyle) { | 177 | if(style.editingNewStyle) { |
177 | if(property === '') { | 178 | if(property === '') { |
@@ -187,14 +188,17 @@ exports.StylesViewDelegate = Montage.create(Component, { | |||
187 | 188 | ||
188 | if(property === '') { | 189 | if(property === '') { |
189 | style.deleting = true; | 190 | style.deleting = true; |
190 | style.parentComponent.parentComponent.removeStyle(style.source); | 191 | declaration.removeStyle(style.source); |
191 | this._dispatchChange(oldProperty, browserValue); | 192 | this._dispatchChange(oldProperty); |
192 | return false; | 193 | return false; |
193 | } | 194 | } |
194 | 195 | ||
195 | // now add new property | 196 | // now add new property |
196 | browserValue = this.stylesController.setStyle(rule, property, value); | 197 | browserValue = this.stylesController.setStyle(rule, property, value); |
197 | 198 | ||
199 | //// Update the css text so it knows when to update | ||
200 | declaration.cssText = rule.style.cssText; | ||
201 | |||
198 | ///// Mark style as invalid if the browser doesn't accept it | 202 | ///// Mark style as invalid if the browser doesn't accept it |
199 | style.invalid = (browserValue === null); | 203 | style.invalid = (browserValue === null); |
200 | 204 | ||
@@ -203,13 +207,18 @@ exports.StylesViewDelegate = Montage.create(Component, { | |||
203 | }, | 207 | }, |
204 | handleValueChange : { | 208 | handleValueChange : { |
205 | value: function(rule, property, value, style) { | 209 | value: function(rule, property, value, style) { |
206 | var browserValue, units; | 210 | var declaration = style.parentComponent.parentComponent, |
211 | browserValue, units; | ||
207 | 212 | ||
208 | if(value === '') { | 213 | if(value === '') { |
209 | ///// Remove old property | 214 | ///// Remove old property |
210 | style.deleting = true; | 215 | style.deleting = true; |
211 | this.stylesController.deleteStyle(rule, property); | 216 | this.stylesController.deleteStyle(rule, property); |
212 | style.parentComponent.parentComponent.removeStyle(style.source); | 217 | declaration.removeStyle(style.source); |
218 | |||
219 | //// Update the css text so it knows when to update | ||
220 | declaration.cssText = rule.style.cssText; | ||
221 | |||
213 | this._dispatchChange(property, browserValue); | 222 | this._dispatchChange(property, browserValue); |
214 | return false; | 223 | return false; |
215 | } | 224 | } |
@@ -218,6 +227,9 @@ exports.StylesViewDelegate = Montage.create(Component, { | |||
218 | browserValue = this.stylesController.setStyle(rule, property, value); | 227 | browserValue = this.stylesController.setStyle(rule, property, value); |
219 | style.browserValue = browserValue; | 228 | style.browserValue = browserValue; |
220 | 229 | ||
230 | //// Update the css text so it knows when to update | ||
231 | declaration.cssText = rule.style.cssText; | ||
232 | |||
221 | ///// Mark style as invalid if the browser doesn't accept it | 233 | ///// Mark style as invalid if the browser doesn't accept it |
222 | style.invalid = (browserValue === null); | 234 | style.invalid = (browserValue === null); |
223 | 235 | ||