diff options
Diffstat (limited to 'js/components/ui/property-control.reel/property-control.js')
-rwxr-xr-x | js/components/ui/property-control.reel/property-control.js | 38 |
1 files changed, 34 insertions, 4 deletions
diff --git a/js/components/ui/property-control.reel/property-control.js b/js/components/ui/property-control.reel/property-control.js index 20ec173e..2f91491f 100755 --- a/js/components/ui/property-control.reel/property-control.js +++ b/js/components/ui/property-control.reel/property-control.js | |||
@@ -1,7 +1,31 @@ | |||
1 | /* <copyright> | 1 | /* <copyright> |
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 2 | Copyright (c) 2012, Motorola Mobility, Inc |
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 3 | All Rights Reserved. |
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | BSD License. |
5 | |||
6 | Redistribution and use in source and binary forms, with or without | ||
7 | modification, are permitted provided that the following conditions are met: | ||
8 | |||
9 | - Redistributions of source code must retain the above copyright notice, | ||
10 | this list of conditions and the following disclaimer. | ||
11 | - Redistributions in binary form must reproduce the above copyright | ||
12 | notice, this list of conditions and the following disclaimer in the | ||
13 | documentation and/or other materials provided with the distribution. | ||
14 | - Neither the name of Motorola Mobility nor the names of its contributors | ||
15 | may be used to endorse or promote products derived from this software | ||
16 | without specific prior written permission. | ||
17 | |||
18 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
19 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
20 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
21 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | ||
22 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
23 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
24 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
25 | INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
26 | CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
27 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
28 | POSSIBILITY OF SUCH DAMAGE. | ||
5 | </copyright> */ | 29 | </copyright> */ |
6 | 30 | ||
7 | var Montage = require("montage/core/core").Montage, | 31 | var Montage = require("montage/core/core").Montage, |
@@ -15,7 +39,8 @@ var Montage = require("montage/core/core").Montage, | |||
15 | TextField = require("js/components/TextField.reel").TextField, | 39 | TextField = require("js/components/TextField.reel").TextField, |
16 | ColorChip = require("js/components/ui/color-chip.reel").ColorChip, | 40 | ColorChip = require("js/components/ui/color-chip.reel").ColorChip, |
17 | FileInput = require("js/components/ui/file-input.reel").FileInput, | 41 | FileInput = require("js/components/ui/file-input.reel").FileInput, |
18 | 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; | ||
19 | 44 | ||
20 | var PropertyControl = exports.PropertyControl = Montage.create(Component, { | 45 | var PropertyControl = exports.PropertyControl = Montage.create(Component, { |
21 | 46 | ||
@@ -237,6 +262,11 @@ var PropertyControl = exports.PropertyControl = Montage.create(Component, { | |||
237 | this._control.addEventListener("changing", this, false); | 262 | this._control.addEventListener("changing", this, false); |
238 | this._prop = "value"; | 263 | this._prop = "value"; |
239 | break; | 264 | break; |
265 | case "GradientPicker": | ||
266 | this._control = GradientPicker.create(); | ||
267 | this._control.addEventListener("change", this, false); | ||
268 | this._prop = "value"; | ||
269 | break; | ||
240 | default: | 270 | default: |
241 | break; | 271 | break; |
242 | } | 272 | } |