diff options
| author | Valerio Virgillito | 2012-06-05 21:43:48 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-06-05 21:43:48 -0700 |
| commit | fb684fb27c2cef04251655d86e55eceed9da3132 (patch) | |
| tree | a7773e4d8ee6cb3d047e5aa5f8c4f33403099574 /js/components/tools-properties/fill-properties.reel/fill-properties.html | |
| parent | e28eb9158a50d7e6d97dbc68066e591ac600c241 (diff) | |
| parent | 18e212dca48066d1ddaca96875a3f40adcc859b6 (diff) | |
| download | ninja-fb684fb27c2cef04251655d86e55eceed9da3132.tar.gz | |
Merge branch 'refs/heads/master' into element-model-fixes
Conflicts:
js/mediators/element-mediator.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/components/tools-properties/fill-properties.reel/fill-properties.html')
| -rwxr-xr-x | js/components/tools-properties/fill-properties.reel/fill-properties.html | 41 |
1 files changed, 34 insertions, 7 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 734966dc..ca447b8b 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.html +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html | |||
| @@ -11,10 +11,35 @@ | |||
| 11 | 11 | ||
| 12 | <script type="text/montage-serialization"> | 12 | <script type="text/montage-serialization"> |
| 13 | { | 13 | { |
| 14 | "_fillMaterialCB": { | 14 | "useFillColor": { |
| 15 | "prototype": "montage/ui/checkbox.reel", | ||
| 16 | "properties": { | ||
| 17 | "element": {"#": "useFillColor"}, | ||
| 18 | "identifier": "useFillColor", | ||
| 19 | "checked": true | ||
| 20 | } | ||
| 21 | }, | ||
| 22 | |||
| 23 | "useWebGL": { | ||
| 24 | "prototype": "montage/ui/checkbox.reel", | ||
| 25 | "properties": { | ||
| 26 | "element": {"#": "useWebGL"}, | ||
| 27 | "identifier": "useWebGL", | ||
| 28 | "checked": false | ||
| 29 | }, | ||
| 30 | "listeners": [ | ||
| 31 | { | ||
| 32 | "type": "action", | ||
| 33 | "listener": {"@": "owner"}, | ||
| 34 | "capture": false | ||
| 35 | } | ||
| 36 | ] | ||
| 37 | }, | ||
| 38 | |||
| 39 | "fillMaterial": { | ||
| 15 | "prototype": "js/components/combobox.reel", | 40 | "prototype": "js/components/combobox.reel", |
| 16 | "properties": { | 41 | "properties": { |
| 17 | "element": {"#": "fillMaterialCB"}, | 42 | "element": {"#": "fillMaterial"}, |
| 18 | "labelField": "_name", | 43 | "labelField": "_name", |
| 19 | "dataField": "_name" | 44 | "dataField": "_name" |
| 20 | } | 45 | } |
| @@ -24,11 +49,12 @@ | |||
| 24 | "properties": { | 49 | "properties": { |
| 25 | "element": {"#": "fillProperties"}, | 50 | "element": {"#": "fillProperties"}, |
| 26 | 51 | ||
| 52 | "useFillColor": {"@": "useFillColor"}, | ||
| 27 | "_fillColorCtrl": {"#": "fillColorCtrl"}, | 53 | "_fillColorCtrl": {"#": "fillColorCtrl"}, |
| 28 | 54 | ||
| 29 | "_useWebGL": {"#": "useWebGLCH"}, | 55 | "useWebGL": {"@": "useWebGL"}, |
| 30 | "_materialsContainer": {"#": "materialsContainer"}, | 56 | "_materialsContainer": {"#": "materialsContainer"}, |
| 31 | "_fillMaterial": {"@": "_fillMaterialCB"} | 57 | "fillMaterial": {"@": "fillMaterial"} |
| 32 | } | 58 | } |
| 33 | } | 59 | } |
| 34 | } | 60 | } |
| @@ -38,16 +64,17 @@ | |||
| 38 | 64 | ||
| 39 | <body> | 65 | <body> |
| 40 | <div data-montage-id="fillProperties" class="subToolHolderPanel optionsFillTool toolOptionsFloatChildren"> | 66 | <div data-montage-id="fillProperties" class="subToolHolderPanel optionsFillTool toolOptionsFloatChildren"> |
| 67 | <input data-montage-id="useFillColor" type="checkbox" name="useFillColorControl" class="nj-skinned"/> | ||
| 41 | <div class="toolColorChipIcon FillTool"></div> | 68 | <div class="toolColorChipIcon FillTool"></div> |
| 42 | <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> | 69 | <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> |
| 43 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </div> | 70 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </div> |
| 44 | 71 | ||
| 45 | <input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/> | 72 | <input data-montage-id="useWebGL" type="checkbox" name="useWebGLControl" class="nj-skinned"/> |
| 46 | <label class="label">Use WebGL</label> | 73 | <label class="label">Use WebGL</label> |
| 47 | <div data-montage-id="materialsContainer" class="materialsContainerOptions toolOptionsFloatChildren"> | 74 | <div data-montage-id="materialsContainer" class="materialsContainerOptions toolOptionsFloatChildren" style="display:none;"> |
| 48 | <label class="label">Material:</label> | 75 | <label class="label">Material:</label> |
| 49 | <div data-montage-id="fillIcon" class="toolColorChipIcon FillTool"></div> | 76 | <div data-montage-id="fillIcon" class="toolColorChipIcon FillTool"></div> |
| 50 | <select data-montage-id="fillMaterialCB" class="nj-skinned"> | 77 | <select data-montage-id="fillMaterial" class="nj-skinned"> |
| 51 | </select> | 78 | </select> |
| 52 | </div> | 79 | </div> |
| 53 | </div> | 80 | </div> |