diff options
author | Armen Kesablyan | 2012-02-13 11:59:19 -0800 |
---|---|---|
committer | Armen Kesablyan | 2012-02-13 11:59:19 -0800 |
commit | 90d0c8c0e98d062c628c061fe5765ce991fda409 (patch) | |
tree | 9780e9dcf475bf319f3cacc1a1ad52fcf9f133af /js/panels/properties | |
parent | 8110e01dc5093ac6baf621103dcaa5f769e5be92 (diff) | |
parent | e142611e22718b1f1d1696902ad9161ec5f33f98 (diff) | |
download | ninja-90d0c8c0e98d062c628c061fe5765ce991fda409.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Conflicts:
css/ninja.css
js/stage/stage.reel/stage.html
js/tools/TextTool.js
node_modules/labs/rich-text-editor.reel/rich-text-editor.css
node_modules/labs/rich-text-editor.reel/rich-text-editor.html
node_modules/labs/rich-text-editor.reel/rich-text-editor.js
node_modules/labs/rich-text-editor.reel/rich-text-resizer.js
node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/properties')
4 files changed, 97 insertions, 21 deletions
diff --git a/js/panels/properties/sections/custom.reel/custom.js b/js/panels/properties/sections/custom.reel/custom.js index 2b5b522a..992db8e6 100644 --- a/js/panels/properties/sections/custom.reel/custom.js +++ b/js/panels/properties/sections/custom.reel/custom.js | |||
@@ -186,6 +186,8 @@ exports.CustomSection = Montage.create(Component, { | |||
186 | if (aField.value) obj.value = aField.value; | 186 | if (aField.value) obj.value = aField.value; |
187 | if (aField.labelField) obj.labelField = aField.labelField; | 187 | if (aField.labelField) obj.labelField = aField.labelField; |
188 | if (aField.labelFunction) obj.labelFunction = aField.labelFunction; | 188 | if (aField.labelFunction) obj.labelFunction = aField.labelFunction; |
189 | if (aField.dataField) obj.dataField = aField.dataField; | ||
190 | if (aField.dataFunction) obj.dataFunction = aField.dataFunction; | ||
189 | if (aField.items) { | 191 | if (aField.items) { |
190 | if(aField.items.boundObject) { | 192 | if(aField.items.boundObject) { |
191 | obj.items = eval(aField.items.boundObject)[aField.items.boundProperty]; | 193 | obj.items = eval(aField.items.boundObject)[aField.items.boundProperty]; |
@@ -193,6 +195,18 @@ exports.CustomSection = Montage.create(Component, { | |||
193 | obj.items = aField.items; | 195 | obj.items = aField.items; |
194 | } | 196 | } |
195 | } | 197 | } |
198 | if (aField.enabled) { | ||
199 | if(aField.enabled.boundObject) { | ||
200 | // TODO - For now, always bind to this.controls[someProperty] | ||
201 | Object.defineBinding(obj, "enabled", { | ||
202 | boundObject: this.controls, | ||
203 | boundObjectPropertyPath: aField.enabled.boundProperty, | ||
204 | oneway: false | ||
205 | }); | ||
206 | } else { | ||
207 | obj.enabled = aField.enabled; | ||
208 | } | ||
209 | } | ||
196 | 210 | ||
197 | obj.addEventListener("change", this, false); | 211 | obj.addEventListener("change", this, false); |
198 | // | 212 | // |
diff --git a/js/panels/properties/sections/position-and-size.reel/position-and-size.js b/js/panels/properties/sections/position-and-size.reel/position-and-size.js index 43f08fcf..49117090 100644 --- a/js/panels/properties/sections/position-and-size.reel/position-and-size.js +++ b/js/panels/properties/sections/position-and-size.reel/position-and-size.js | |||
@@ -28,6 +28,14 @@ exports.PosSize = Montage.create(Component, { | |||
28 | value: null | 28 | value: null |
29 | }, | 29 | }, |
30 | 30 | ||
31 | aspectRatioWidth: { | ||
32 | value: null | ||
33 | }, | ||
34 | |||
35 | aspectRatioHeight: { | ||
36 | value: null | ||
37 | }, | ||
38 | |||
31 | _disablePosition: { | 39 | _disablePosition: { |
32 | value: true | 40 | value: true |
33 | }, | 41 | }, |
@@ -62,9 +70,8 @@ exports.PosSize = Montage.create(Component, { | |||
62 | this.widthControl.addEventListener("change", this, false); | 70 | this.widthControl.addEventListener("change", this, false); |
63 | this.widthControl.addEventListener("changing", this, false); | 71 | this.widthControl.addEventListener("changing", this, false); |
64 | 72 | ||
65 | 73 | this.bindButton.identifier = "ratio"; | |
66 | //this._controlList[0].control.addEventListener("action", this._handleStageEvent.bind(this), false); | 74 | this.bindButton.addEventListener("action", this, false); |
67 | //PropertiesPanelModule.PropertiesPanelBase.PIControlList["stageWidthHeightLock"] = this._controlList[0].control; | ||
68 | 75 | ||
69 | } | 76 | } |
70 | }, | 77 | }, |
@@ -87,6 +94,25 @@ exports.PosSize = Montage.create(Component, { | |||
87 | } | 94 | } |
88 | }, | 95 | }, |
89 | 96 | ||
97 | /** | ||
98 | * Calculate the current aspect ration when the bind button is pressed. | ||
99 | * If one of the values is 0, then use 1:1 as the ratio; | ||
100 | */ | ||
101 | handleRatioAction: { | ||
102 | value: function() { | ||
103 | if(this.bindButton.value) { | ||
104 | this.aspectRatioWidth = this.heightControl.value / this.widthControl.value; | ||
105 | if(isNaN(this.aspectRatioWidth) || !isFinite(this.aspectRatioWidth) || this.aspectRatioWidth === 0) this.aspectRatioWidth = 1; | ||
106 | |||
107 | this.aspectRatioHeight = this.widthControl.value / this.heightControl.value; | ||
108 | if(isNaN(this.aspectRatioHeight) || !isFinite(this.aspectRatioHeight) || this.aspectRatioHeight === 0) this.aspectRatioHeight = 1; | ||
109 | } else { | ||
110 | this.aspectRatioWidth = 1; | ||
111 | this.aspectRatioHeight = 1; | ||
112 | } | ||
113 | } | ||
114 | }, | ||
115 | |||
90 | handleLeftChange: { | 116 | handleLeftChange: { |
91 | value: function(event) { | 117 | value: function(event) { |
92 | var prevPosition; | 118 | var prevPosition; |
@@ -121,6 +147,17 @@ exports.PosSize = Montage.create(Component, { | |||
121 | if(this.savedPosition) prevPosition = [this.savedPosition + "px"]; | 147 | if(this.savedPosition) prevPosition = [this.savedPosition + "px"]; |
122 | 148 | ||
123 | this.application.ninja.selectedElements.length ? items = this.application.ninja.selectedElements : items = [this.application.ninja.currentDocument.documentRoot]; | 149 | this.application.ninja.selectedElements.length ? items = this.application.ninja.selectedElements : items = [this.application.ninja.currentDocument.documentRoot]; |
150 | |||
151 | if(this.bindButton.value) { | ||
152 | |||
153 | var newWidth = Math.round(this.aspectRatioHeight * this.heightControl.value); | ||
154 | |||
155 | if(!isFinite(newWidth)) newWidth = this.heightControl.value; | ||
156 | |||
157 | this.widthControl.value = newWidth; | ||
158 | this.application.ninja.elementMediator.setProperty(items, "width", [newWidth + "px"] , "Change", "pi"); | ||
159 | } | ||
160 | |||
124 | this.application.ninja.elementMediator.setProperty(items, "height", [this.heightControl.value + "px"] , "Change", "pi", prevPosition); | 161 | this.application.ninja.elementMediator.setProperty(items, "height", [this.heightControl.value + "px"] , "Change", "pi", prevPosition); |
125 | this.savedPosition = null; | 162 | this.savedPosition = null; |
126 | } | 163 | } |
@@ -135,9 +172,23 @@ exports.PosSize = Montage.create(Component, { | |||
135 | if(this.savedPosition) prevPosition = [this.savedPosition + "px"]; | 172 | if(this.savedPosition) prevPosition = [this.savedPosition + "px"]; |
136 | 173 | ||
137 | this.application.ninja.selectedElements.length ? items = this.application.ninja.selectedElements : items = [this.application.ninja.currentDocument.documentRoot]; | 174 | this.application.ninja.selectedElements.length ? items = this.application.ninja.selectedElements : items = [this.application.ninja.currentDocument.documentRoot]; |
175 | |||
176 | if(this.bindButton.value) { | ||
177 | |||
178 | var newHeight = Math.round(this.aspectRatioWidth * this.widthControl.value); | ||
179 | |||
180 | if(!isFinite(newHeight)) newHeight = this.widthControl.value; | ||
181 | |||
182 | this.heightControl.value = newHeight; | ||
183 | this.application.ninja.elementMediator.setProperty(items, "height", [newHeight + "px"] , "Change", "pi"); | ||
184 | |||
185 | } | ||
186 | |||
138 | this.application.ninja.elementMediator.setProperty(items, "width", [this.widthControl.value + "px"] , "Change", "pi", prevPosition); | 187 | this.application.ninja.elementMediator.setProperty(items, "width", [this.widthControl.value + "px"] , "Change", "pi", prevPosition); |
139 | this.savedPosition = null; | 188 | this.savedPosition = null; |
189 | |||
140 | } | 190 | } |
191 | |||
141 | } | 192 | } |
142 | }, | 193 | }, |
143 | 194 | ||
@@ -166,24 +217,22 @@ exports.PosSize = Montage.create(Component, { | |||
166 | var items; | 217 | var items; |
167 | if(!event.wasSetByCode) { | 218 | if(!event.wasSetByCode) { |
168 | 219 | ||
220 | if(!this.savedPosition) this.savedPosition = this.heightSize; | ||
221 | |||
222 | this.application.ninja.selectedElements.length ? items = this.application.ninja.selectedElements : items = [this.application.ninja.currentDocument.documentRoot]; | ||
223 | |||
169 | if(this.bindButton.value) { | 224 | if(this.bindButton.value) { |
170 | if(!this.savedPosition) this.savedPosition = this.heightSize; | ||
171 | var delta = this.heightControl.value - this.savedPosition; | ||
172 | 225 | ||
173 | var hwRatio = Math.round(Math.round(this.widthControl.value / this.savedPosition * 10) / 10); | 226 | var newWidth = Math.round(this.aspectRatioHeight * this.heightControl.value); |
174 | var newWidth = this.widthControl.value + hwRatio * delta; | 227 | |
228 | if(!isFinite(newWidth)) newWidth = this.heightControl.value; | ||
175 | 229 | ||
176 | this.application.ninja.selectedElements.length ? items = this.application.ninja.selectedElements : items = [this.application.ninja.currentDocument.documentRoot]; | ||
177 | this.widthControl.value = newWidth; | 230 | this.widthControl.value = newWidth; |
178 | this.application.ninja.elementMediator.setProperty(items, "height", [this.heightControl.value + "px"] , "Changing", "pi"); | ||
179 | this.application.ninja.elementMediator.setProperty(items, "width", [newWidth + "px"] , "Changing", "pi"); | 231 | this.application.ninja.elementMediator.setProperty(items, "width", [newWidth + "px"] , "Changing", "pi"); |
180 | } else { | 232 | } |
181 | 233 | ||
182 | if(!this.savedPosition) this.savedPosition = this.heightSize; | 234 | this.application.ninja.elementMediator.setProperty(items, "height", [this.heightControl.value + "px"] , "Changing", "pi"); |
183 | 235 | ||
184 | this.application.ninja.selectedElements.length ? items = this.application.ninja.selectedElements : items = [this.application.ninja.currentDocument.documentRoot]; | ||
185 | this.application.ninja.elementMediator.setProperty(items, "height", [this.heightControl.value + "px"] , "Changing", "pi"); | ||
186 | } | ||
187 | } | 236 | } |
188 | } | 237 | } |
189 | }, | 238 | }, |
@@ -192,8 +241,20 @@ exports.PosSize = Montage.create(Component, { | |||