Merge pull request #346 from mqg734/MaterialsUI

UI support for preview, edit, duplicate and delete of WebGL Materials.

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,
     TextField = require("js/components/TextField.reel").TextField,
     ColorChip = require("js/components/ui/color-chip.reel").ColorChip,
     FileInput = require("js/components/ui/file-input.reel").FileInput,
-    InputGroup = require("js/components/ui/input-group.reel").InputGroup;
+    InputGroup = require("js/components/ui/input-group.reel").InputGroup,
+    GradientPicker = require("js/components/gradientpicker.reel").GradientPicker;
 
 var PropertyControl = exports.PropertyControl = Montage.create(Component, {
 
@@ -261,6 +262,11 @@ var PropertyControl = exports.PropertyControl = Montage.create(Component, {
                     this._control.addEventListener("changing", this, false);
                     this._prop = "value";
                     break;
+                case "GradientPicker":
+                    this._control = GradientPicker.create();
+                    this._control.addEventListener("change", this, false);
+                    this._prop = "value";
+                    break;
                 default:
                     break;
             }