diff options
author | Eric Guzman | 2012-07-17 18:40:55 -0700 |
---|---|---|
committer | Eric Guzman | 2012-07-17 18:40:55 -0700 |
commit | cbd4d317c354137cc3b5f74d1021ea00a3f5b779 (patch) | |
tree | a9edd75cd891c881e6740d54ae5d622046f3cd78 /js/panels/css-panel | |
parent | bc7ffffb2bac3bf09d17d855d32a5f0d154fab3b (diff) | |
download | ninja-cbd4d317c354137cc3b5f74d1021ea00a3f5b779.tar.gz |
CSS Panel - Handle media attribute changes
Diffstat (limited to 'js/panels/css-panel')
-rw-r--r-- | js/panels/css-panel/style-sheet.reel/style-sheet.html | 3 | ||||
-rw-r--r-- | js/panels/css-panel/style-sheet.reel/style-sheet.js | 20 |
2 files changed, 21 insertions, 2 deletions
diff --git a/js/panels/css-panel/style-sheet.reel/style-sheet.html b/js/panels/css-panel/style-sheet.reel/style-sheet.html index 035bc760..01b5f20c 100644 --- a/js/panels/css-panel/style-sheet.reel/style-sheet.html +++ b/js/panels/css-panel/style-sheet.reel/style-sheet.html | |||
@@ -62,6 +62,9 @@ POSSIBILITY OF SUCH DAMAGE. | |||
62 | "prototype": "js/components/textfield.reel[TextField]", | 62 | "prototype": "js/components/textfield.reel[TextField]", |
63 | "properties": { | 63 | "properties": { |
64 | "element": {"#": "media-input"} | 64 | "element": {"#": "media-input"} |
65 | }, | ||
66 | "bindings": { | ||
67 | "value": {"<->": "@owner.mediaText"} | ||
65 | } | 68 | } |
66 | }, | 69 | }, |
67 | "editButton": { | 70 | "editButton": { |
diff --git a/js/panels/css-panel/style-sheet.reel/style-sheet.js b/js/panels/css-panel/style-sheet.reel/style-sheet.js index b7df05a7..8a8e7dbf 100644 --- a/js/panels/css-panel/style-sheet.reel/style-sheet.js +++ b/js/panels/css-panel/style-sheet.reel/style-sheet.js | |||
@@ -71,6 +71,9 @@ exports.StyleSheet = Montage.create(Component, { | |||
71 | prepareForDraw : { | 71 | prepareForDraw : { |
72 | value: function() { | 72 | value: function() { |
73 | this.nameText.element.addEventListener('click', this, false); | 73 | this.nameText.element.addEventListener('click', this, false); |
74 | |||
75 | //// Set the initial media text value | ||
76 | this.mediaText = this._source.media.mediaText; | ||
74 | } | 77 | } |
75 | }, | 78 | }, |
76 | 79 | ||
@@ -89,8 +92,6 @@ exports.StyleSheet = Montage.create(Component, { | |||
89 | value: function() { | 92 | value: function() { |
90 | var transStr = '-webkit-transform'; | 93 | var transStr = '-webkit-transform'; |
91 | 94 | ||
92 | this.mediaInput.value = this._source.media.mediaText; | ||
93 | |||
94 | if(this.editing) { | 95 | if(this.editing) { |
95 | this.editView.classList.add('expanded'); | 96 | this.editView.classList.add('expanded'); |
96 | this.editView.style.setProperty(transStr, 'translate3d(-'+ this._translateDistance + 'px,0,0)'); | 97 | this.editView.style.setProperty(transStr, 'translate3d(-'+ this._translateDistance + 'px,0,0)'); |
@@ -194,6 +195,21 @@ exports.StyleSheet = Montage.create(Component, { | |||
194 | this._name = text; | 195 | this._name = text; |
195 | } | 196 | } |
196 | }, | 197 | }, |
198 | |||
199 | _mediaText : { value: null }, | ||
200 | mediaText : { | ||
201 | get : function() { return this._mediaText; }, | ||
202 | set : function(value) { | ||
203 | if(value === this._mediaText) { return; } | ||
204 | |||
205 | this._source.ownerNode.setAttribute('media', value); | ||
206 | |||
207 | this._mediaText = value; | ||
208 | |||
209 | this.needsDraw = true; | ||
210 | } | ||
211 | }, | ||
212 | |||
197 | _dirty : { | 213 | _dirty : { |
198 | value: null | 214 | value: null |
199 | }, | 215 | }, |