aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/fill-properties.reel/fill-properties.html
diff options
context:
space:
mode:
authorPushkar Joshi2012-04-27 15:05:38 -0700
committerPushkar Joshi2012-04-27 15:05:38 -0700
commitc8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc (patch)
tree74fcb9818a917d4f8ddb0db0c78a8cff9af86339 /js/components/tools-properties/fill-properties.reel/fill-properties.html
parent28d1594b868e3c08e5603adbd5b29df1e24d57e9 (diff)
parentc8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff)
downloadninja-c8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/components/tools-properties/fill-properties.reel/fill-properties.html')
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.html8
1 files changed, 3 insertions, 5 deletions
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.html b/js/components/tools-properties/fill-properties.reel/fill-properties.html
index a35f9b15..b81b09ba 100755
--- a/js/components/tools-properties/fill-properties.reel/fill-properties.html
+++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!DOCTYPE HTML>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -12,8 +12,7 @@
12 <script type="text/montage-serialization"> 12 <script type="text/montage-serialization">
13 { 13 {
14 "_fillMaterialCB": { 14 "_fillMaterialCB": {
15 "module": "js/components/combobox.reel", 15 "prototype": "js/components/combobox.reel",
16 "name": "Combobox",
17 "properties": { 16 "properties": {
18 "element": {"#": "fillMaterialCB"}, 17 "element": {"#": "fillMaterialCB"},
19 "labelField": "_name", 18 "labelField": "_name",
@@ -21,8 +20,7 @@
21 } 20 }
22 }, 21 },
23 "owner": { 22 "owner": {
24 "module": "js/components/tools-properties/fill-properties.reel", 23 "prototype": "js/components/tools-properties/fill-properties.reel",
25 "name": "FillProperties",
26 "properties": { 24 "properties": {
27 "element": {"#": "fillProperties"}, 25 "element": {"#": "fillProperties"},
28 "_useWebGL": {"#": "useWebGLCH"}, 26 "_useWebGL": {"#": "useWebGLCH"},