diff options
author | Valerio Virgillito | 2012-07-09 12:15:26 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-07-09 12:15:26 -0700 |
commit | 1839f24e8dcbad38d1381bbcd65c17a9caa45987 (patch) | |
tree | 516a29ca99d4aae0d5228223fff438c1a3c4e0d3 /js/components/ui | |
parent | aedd14b18695d031f695d27dfbd94df5614495bb (diff) | |
parent | febfdb18042d1c73ac58ee4e35c5f176428dee00 (diff) | |
download | ninja-1839f24e8dcbad38d1381bbcd65c17a9caa45987.tar.gz |
Merge pull request #346 from mqg734/MaterialsUI
UI support for preview, edit, duplicate and delete of WebGL Materials.
Diffstat (limited to 'js/components/ui')
-rwxr-xr-x | js/components/ui/property-control.reel/property-control.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/js/components/ui/property-control.reel/property-control.js b/js/components/ui/property-control.reel/property-control.js index 6e0a3916..2f91491f 100755 --- a/js/components/ui/property-control.reel/property-control.js +++ b/js/components/ui/property-control.reel/property-control.js | |||
@@ -39,7 +39,8 @@ var Montage = require("montage/core/core").Montage, | |||
39 | TextField = require("js/components/TextField.reel").TextField, | 39 | TextField = require("js/components/TextField.reel").TextField, |
40 | ColorChip = require("js/components/ui/color-chip.reel").ColorChip, | 40 | ColorChip = require("js/components/ui/color-chip.reel").ColorChip, |
41 | FileInput = require("js/components/ui/file-input.reel").FileInput, | 41 | FileInput = require("js/components/ui/file-input.reel").FileInput, |
42 | InputGroup = require("js/components/ui/input-group.reel").InputGroup; | 42 | InputGroup = require("js/components/ui/input-group.reel").InputGroup, |
43 | GradientPicker = require("js/components/gradientpicker.reel").GradientPicker; | ||
43 | 44 | ||
44 | var PropertyControl = exports.PropertyControl = Montage.create(Component, { | 45 | var PropertyControl = exports.PropertyControl = Montage.create(Component, { |
45 | 46 | ||
@@ -261,6 +262,11 @@ var PropertyControl = exports.PropertyControl = Montage.create(Component, { | |||
261 | this._control.addEventListener("changing", this, false); | 262 | this._control.addEventListener("changing", this, false); |
262 | this._prop = "value"; | 263 | this._prop = "value"; |
263 | break; | 264 | break; |
265 | case "GradientPicker": | ||
266 | this._control = GradientPicker.create(); | ||
267 | this._control.addEventListener("change", this, false); | ||
268 | this._prop = "value"; | ||
269 | break; | ||
264 | default: | 270 | default: |
265 | break; | 271 | break; |
266 | } | 272 | } |