diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/components/tools-properties/fill-properties.reel | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz | |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
Diffstat (limited to 'js/components/tools-properties/fill-properties.reel')
| -rwxr-xr-x | js/components/tools-properties/fill-properties.reel/fill-properties.html | 18 |
1 files changed, 8 insertions, 10 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..77a0af5e 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"}, |
| @@ -36,13 +34,13 @@ | |||
| 36 | </head> | 34 | </head> |
| 37 | 35 | ||
| 38 | <body> | 36 | <body> |
| 39 | <div id="fillProperties" class="subToolHolderPanel"> | 37 | <div data-montage-id="fillProperties" class="subToolHolderPanel"> |
| 40 | <label class="label subOption"><input id="useWebGLCH" type="checkbox" name="useWebGLControl" class="checkBoxAlign"/> Use WebGL</label> | 38 | <label class="label subOption"><input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="checkBoxAlign"/> Use WebGL</label> |
| 41 | 39 | ||
| 42 | <div id="materialsContainer" class="leftLabel" style="padding-top: 3px;"> | 40 | <div data-montage-id="materialsContainer" class="leftLabel" style="padding-top: 3px;"> |
| 43 | <label class="label"> Materials:</label> | 41 | <label class="label"> Materials:</label> |
| 44 | <div id="fillIcon" class="bucketToolUp" style="float: left;"></div> | 42 | <div data-montage-id="fillIcon" class="bucketToolUp" style="float: left;"></div> |
| 45 | <select id="fillMaterialCB" class="nj-skinned"> | 43 | <select data-montage-id="fillMaterialCB" class="nj-skinned"> |
| 46 | </select> | 44 | </select> |
| 47 | </div> | 45 | </div> |
| 48 | </div> | 46 | </div> |