aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValerio Virgillito2012-04-04 16:55:04 -0700
committerValerio Virgillito2012-04-04 16:55:04 -0700
commitb60e576af3915ce0cd7b60ed5e8ed6ff6f1ea9dc (patch)
tree193d62d8a4faa615710c6bf7d30350a92feec30f
parent347b4179be5581841fc94825dcb18901e625c670 (diff)
downloadninja-b60e576af3915ce0cd7b60ed5e8ed6ff6f1ea9dc.tar.gz
fixing the number fields to not have units.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.js4
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.js29
2 files changed, 31 insertions, 2 deletions
diff --git a/js/panels/components-panel.reel/components-panel.js b/js/panels/components-panel.reel/components-panel.js
index 96713691..acbf702f 100755
--- a/js/panels/components-panel.reel/components-panel.js
+++ b/js/panels/components-panel.reel/components-panel.js
@@ -230,9 +230,9 @@ exports.ComponentsPanel = Montage.create(Component, {
230 case "select": 230 case "select":
231 return "dropdown"; 231 return "dropdown";
232 case "number": 232 case "number":
233 return "hottext"; 233 return "ht";
234 default: 234 default:
235 alert("Conversion not implemented for ", type); 235 alert("Conversion not implemented for " + type);
236 } 236 }
237 } 237 }
238 }, 238 },
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.js b/js/panels/properties.reel/sections/custom.reel/custom.js
index ac316907..876fe110 100755
--- a/js/panels/properties.reel/sections/custom.reel/custom.js
+++ b/js/panels/properties.reel/sections/custom.reel/custom.js
@@ -15,6 +15,7 @@ var ColorSelect = require("js/panels/properties.reel/sections/custom-rows/color-
15 15
16// Components Needed to make this work 16// Components Needed to make this work
17var Hottext = require("js/components/hottextunit.reel").HotTextUnit; 17var Hottext = require("js/components/hottextunit.reel").HotTextUnit;
18var HT = require("js/components/hottext.reel").HotText;
18var Dropdown = require("js/components/combobox.reel").Combobox; 19var Dropdown = require("js/components/combobox.reel").Combobox;
19var TextField = require("js/components/textfield.reel").TextField; 20var TextField = require("js/components/textfield.reel").TextField;
20var FileInput = require("js/components/ui/file-input.reel").FileInput; 21var FileInput = require("js/components/ui/file-input.reel").FileInput;
@@ -168,6 +169,7 @@ exports.CustomSection = Montage.create(Component, {
168 value: function(fields) { 169 value: function(fields) {
169 switch(fields.type) { 170 switch(fields.type) {
170 case "hottext" : return this.createHottext(fields); 171 case "hottext" : return this.createHottext(fields);
172 case "ht" : return this.createHT(fields);
171 case "dropdown" : return this.createDropdown(fields); 173 case "dropdown" : return this.createDropdown(fields);
172 case "textbox" : return this.createTextField(fields); 174 case "textbox" : return this.createTextField(fields);
173 case "file" : return this.createFileInput(fields); 175 case "file" : return this.createFileInput(fields);
@@ -178,6 +180,33 @@ exports.CustomSection = Montage.create(Component, {
178 } 180 }
179 }, 181 },
180 182
183 createHT: {
184 value: function(aField) {
185
186 // Generate Hottext
187 var obj = HT.create();
188
189 // Set Values for HottextRow
190 if (aField.id) obj.id = aField.id;
191 if (aField.value) obj.value = aField.value;
192 if (aField.min) obj._minValue = aField.min;
193 if (aField.max) obj._maxValue = aField.max;
194 if (aField.prop) obj.prop = aField.prop;
195
196 //Initiate onChange Events
197 obj.addEventListener("change", this, false);
198 obj.addEventListener("changing", this, false);
199
200 //Bind object value to controls list so it can be manipulated
201 Object.defineBinding(this.controls, aField.id, {
202 boundObject: obj,
203 boundObjectPropertyPath: "value"
204 });
205
206 return obj;
207 }
208 },
209
181 //Breaking Up Switch Case Statement to functions to return a row 210 //Breaking Up Switch Case Statement to functions to return a row
182 createHottext: { 211 createHottext: {
183 value: function(aField) { 212 value: function(aField) {