aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui/property-control.reel/property-control.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-24 12:08:49 -0800
committerPushkar Joshi2012-02-24 12:08:49 -0800
commit03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch)
treec51112223ceb9121cd595a60335eb2795215590f /js/components/ui/property-control.reel/property-control.js
parentfcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff)
parent053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff)
downloadninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz
Merge branch 'pentool' into brushtool
Conflicts: imports/codemirror/mode/scheme/scheme.js js/tools/BrushTool.js
Diffstat (limited to 'js/components/ui/property-control.reel/property-control.js')
-rwxr-xr-x[-rw-r--r--]js/components/ui/property-control.reel/property-control.js27
1 files changed, 14 insertions, 13 deletions
diff --git a/js/components/ui/property-control.reel/property-control.js b/js/components/ui/property-control.reel/property-control.js
index 586d2e9a..58b1be9f 100644..100755
--- a/js/components/ui/property-control.reel/property-control.js
+++ b/js/components/ui/property-control.reel/property-control.js
@@ -6,16 +6,16 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
6 6
7var Montage = require("montage/core/core").Montage, 7var Montage = require("montage/core/core").Montage,
8 Component = require("montage/ui/component").Component, 8 Component = require("montage/ui/component").Component,
9 HotText = require("js/components/hottext").HotText, 9 HotText = require("js/components/hottext.reel").HotText,
10 HotTextUnit = require("js/components/hottextunit").HotTextUnit, 10 HotTextUnit = require("js/components/hottextunit.reel").HotTextUnit,
11 Slider = require("js/components/slider").Slider, 11 Slider = require("js/components/slider.reel").Slider,
12 Button = require("js/components/button").Button, 12 Button = require("js/components/button.reel").Button,
13 Checkbox = require("js/components/checkbox").Checkbox, 13 Checkbox = require("js/components/checkbox.reel").Checkbox,
14 Combobox = require("js/components/combobox").Combobox, 14 Combobox = require("js/components/combobox.reel").Combobox,
15 TextField = require("js/components/TextField").TextField, 15 TextField = require("js/components/TextField.reel").TextField,
16 ColorChip = require("js/components/ui/color-chip").ColorChip, 16 ColorChip = require("js/components/ui/color-chip.reel").ColorChip,
17 FileInput = require("js/components/ui/file-input").FileInput, 17 FileInput = require("js/components/ui/file-input.reel").FileInput,
18 InputGroup = require("js/components/ui/input-group").InputGroup; 18 InputGroup = require("js/components/ui/input-group.reel").InputGroup;
19 19
20var PropertyControl = exports.PropertyControl = Montage.create(Component, { 20var PropertyControl = exports.PropertyControl = Montage.create(Component, {
21 21
@@ -134,7 +134,7 @@ var PropertyControl = exports.PropertyControl = Montage.create(Component, {
134 { 134 {
135 this._control[n] = defaults[n]; 135 this._control[n] = defaults[n];
136 } 136 }
137 137 this._labelField.innerHTML = this._label;
138 this._control.needsDraw = true; 138 this._control.needsDraw = true;
139 } 139 }
140 }, 140 },
@@ -170,8 +170,6 @@ var PropertyControl = exports.PropertyControl = Montage.create(Component, {
170 170
171 prepareForDraw: { 171 prepareForDraw: {
172 value: function() { 172 value: function() {
173 this._labelField.innerHTML = this._label;
174
175 switch(this._controlType) 173 switch(this._controlType)
176 { 174 {
177 case "HotText": 175 case "HotText":
@@ -199,6 +197,9 @@ var PropertyControl = exports.PropertyControl = Montage.create(Component, {
199 break; 197 break;
200 case "ColorChip": 198 case "ColorChip":
201 this._control = ColorChip.create(); 199 this._control = ColorChip.create();
200 this._control.chip = true;
201 this._control.hasIcon = false;
202 this._control.mode = "chip";
202 this._control.addEventListener("change", this, false); 203 this._control.addEventListener("change", this, false);
203 this._prop = "color"; 204 this._prop = "color";
204 break; 205 break;