diff options
author | Valerio Virgillito | 2012-05-18 16:35:56 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-18 16:35:56 -0700 |
commit | fdfba499f0b84360b96096fa866a981e96e8756c (patch) | |
tree | 991e4558104f6b7745d1e0675185496a0c01e0bb /js/panels | |
parent | 66edf78c7e5df11218ef733686965beab05c7c7d (diff) | |
download | ninja-fdfba499f0b84360b96096fa866a981e96e8756c.tar.gz |
fixing the color chip for the document root
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/panels')
-rwxr-xr-x | js/panels/properties.reel/properties.js | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js index 4d048472..eb362796 100755 --- a/js/panels/properties.reel/properties.js +++ b/js/panels/properties.reel/properties.js | |||
@@ -46,7 +46,7 @@ exports.Properties = Montage.create(Component, { | |||
46 | 46 | ||
47 | prepareForDraw: { | 47 | prepareForDraw: { |
48 | value : function() { | 48 | value : function() { |
49 | 49 | this.eventManager.addEventListener("openDocument", this, false); | |
50 | this.eventManager.addEventListener("selectionChange", this, false); | 50 | this.eventManager.addEventListener("selectionChange", this, false); |
51 | 51 | ||
52 | // This will be a toggle option | 52 | // This will be a toggle option |
@@ -54,8 +54,6 @@ exports.Properties = Montage.create(Component, { | |||
54 | this.eventManager.addEventListener( "elementChanging", this, false); | 54 | this.eventManager.addEventListener( "elementChanging", this, false); |
55 | } | 55 | } |
56 | 56 | ||
57 | this.eventManager.addEventListener("openDocument", this, false); | ||
58 | |||
59 | this.elementId.element.addEventListener("blur", this, false); | 57 | this.elementId.element.addEventListener("blur", this, false); |
60 | this.elementId.element.addEventListener("focus", this, false); | 58 | this.elementId.element.addEventListener("focus", this, false); |
61 | this.elementId.element.addEventListener("keyup", this, false); | 59 | this.elementId.element.addEventListener("keyup", this, false); |
@@ -70,6 +68,9 @@ exports.Properties = Montage.create(Component, { | |||
70 | value: function() { | 68 | value: function() { |
71 | this.eventManager.addEventListener( "elementChange", this, false); | 69 | this.eventManager.addEventListener( "elementChange", this, false); |
72 | 70 | ||
71 | // Save a reference of the pi inside the document view to be able to clear | ||
72 | this.application.ninja.currentDocument.model.views.design.propertiesPanel = this; | ||
73 | |||
73 | // Display the default document root PI | 74 | // Display the default document root PI |
74 | this.displayElementProperties(this.application.ninja.currentDocument.documentRoot); | 75 | this.displayElementProperties(this.application.ninja.currentDocument.documentRoot); |
75 | } | 76 | } |
@@ -165,6 +166,15 @@ exports.Properties = Montage.create(Component, { | |||
165 | } | 166 | } |
166 | }, | 167 | }, |
167 | 168 | ||
169 | clear: { | ||
170 | value: function() { | ||
171 | this.elementName.value = ""; | ||
172 | this.elementId.value = ""; | ||
173 | this.elementClass.value = ""; | ||
174 | this.customPi = null; | ||
175 | } | ||
176 | }, | ||
177 | |||
168 | displayElementProperties: { | 178 | displayElementProperties: { |
169 | value: function (el) { | 179 | value: function (el) { |
170 | var customPI, currentValue, isRoot = this.application.ninja.selectionController.isDocument; | 180 | var customPI, currentValue, isRoot = this.application.ninja.selectionController.isDocument; |
@@ -210,9 +220,16 @@ exports.Properties = Montage.create(Component, { | |||
210 | this.displayCustomProperties(el, el.elementModel.pi); | 220 | this.displayCustomProperties(el, el.elementModel.pi); |
211 | } | 221 | } |
212 | 222 | ||
223 | // Root element color chip | ||
213 | if(isRoot) { | 224 | if(isRoot) { |
214 | var backgroundChip = this.customSections[0].content.controls["background"]; | 225 | var backgroundChip = this.customSections[0].content.controls["background"]; |
215 | if(backgroundChip) backgroundChip.color = ElementsMediator.getProperty(el, "background"); | 226 | var rootBackgroundColor = ElementsMediator.getProperty(el, "background"); |
227 | |||
228 | if(rootBackgroundColor) { | ||
229 | backgroundChip.color = rootBackgroundColor; | ||
230 | } else { | ||
231 | backgroundChip.color = null; | ||
232 | } | ||
216 | } | 233 | } |
217 | 234 | ||
218 | var previousInput = this.application.ninja.colorController.colorModel.input; | 235 | var previousInput = this.application.ninja.colorController.colorModel.input; |