diff options
| author | Valerio Virgillito | 2012-07-09 12:15:26 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-07-09 12:15:26 -0700 |
| commit | 1839f24e8dcbad38d1381bbcd65c17a9caa45987 (patch) | |
| tree | 516a29ca99d4aae0d5228223fff438c1a3c4e0d3 /js/panels/Materials/materials-library-panel.reel/materials-library-panel.html | |
| parent | aedd14b18695d031f695d27dfbd94df5614495bb (diff) | |
| parent | febfdb18042d1c73ac58ee4e35c5f176428dee00 (diff) | |
| download | ninja-1839f24e8dcbad38d1381bbcd65c17a9caa45987.tar.gz | |
Merge pull request #346 from mqg734/MaterialsUI
UI support for preview, edit, duplicate and delete of WebGL Materials.
Diffstat (limited to 'js/panels/Materials/materials-library-panel.reel/materials-library-panel.html')
| -rwxr-xr-x | js/panels/Materials/materials-library-panel.reel/materials-library-panel.html | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html index f77d3186..e9a2d20d 100755 --- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html +++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html | |||
| @@ -34,12 +34,12 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 34 | <link rel="stylesheet" type="text/css" href="materials-library-panel.css"> | 34 | <link rel="stylesheet" type="text/css" href="materials-library-panel.css"> |
| 35 | <script type="text/montage-serialization"> | 35 | <script type="text/montage-serialization"> |
| 36 | { | 36 | { |
| 37 | "addButton": { | 37 | "duplicateButton": { |
| 38 | "prototype": "montage/ui/button.reel", | 38 | "prototype": "montage/ui/button.reel", |
| 39 | "properties": { | 39 | "properties": { |
| 40 | "element": {"#": "ml_add_btn"}, | 40 | "element": {"#": "ml_duplicate_btn"}, |
| 41 | "enabled": false | 41 | "enabled": true |
| 42 | }, | 42 | }, |
| 43 | "listeners": [ | 43 | "listeners": [ |
| 44 | { | 44 | { |
| 45 | "type": "action", | 45 | "type": "action", |
| @@ -47,11 +47,10 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 47 | } | 47 | } |
| 48 | ] | 48 | ] |
| 49 | }, | 49 | }, |
| 50 | "copyButton": { | 50 | "editButton": { |
| 51 | "prototype": "montage/ui/button.reel", | 51 | "prototype": "montage/ui/button.reel", |
| 52 | "properties": { | 52 | "properties": { |
| 53 | "element": {"#": "ml_copy_btn"}, | 53 | "element": {"#": "ml_edit_btn"} |
| 54 | "enabled": false | ||
| 55 | }, | 54 | }, |
| 56 | "listeners": [ | 55 | "listeners": [ |
| 57 | { | 56 | { |
| @@ -106,7 +105,9 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 106 | "prototype": "js/panels/Materials/materials-library-panel.reel[MaterialsLibraryPanels]", | 105 | "prototype": "js/panels/Materials/materials-library-panel.reel[MaterialsLibraryPanels]", |
| 107 | "properties": { | 106 | "properties": { |
| 108 | "element": {"#": "materials_library_panel"}, | 107 | "element": {"#": "materials_library_panel"}, |
| 109 | "_materialInfo": {"@": "materialInfo"} | 108 | "_materialInfo": {"@": "materialInfo"}, |
| 109 | "materialsController": {"@": "materialsController"}, | ||
| 110 | "deleteButton": {"@": "deleteButton"} | ||
| 110 | } | 111 | } |
| 111 | } | 112 | } |
| 112 | } | 113 | } |
| @@ -116,14 +117,14 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 116 | <body> | 117 | <body> |
| 117 | 118 | ||
| 118 | <div data-montage-id="materials_library_panel" class="materials_library_panel"> | 119 | <div data-montage-id="materials_library_panel" class="materials_library_panel"> |
| 119 | <section data-montage-id="ml_tree_holder" class="animationsLibrary"> | 120 | <section data-montage-id="ml_tree_holder" class="ml_tree_holder"> |
| 120 | <div data-montage-id="materials_library_tree"></div> | 121 | <div data-montage-id="materials_library_tree"></div> |
| 121 | </section> | 122 | </section> |
| 122 | <hr /> | 123 | <hr /> |
| 123 | <div data-montage-id="ml_buttons" class="ml_buttons"> | 124 | <div data-montage-id="ml_buttons" class="ml_buttons"> |
| 124 | <button data-montage-id="ml_add_btn" class="nj-skinned">Add</button> | 125 | <button data-montage-id="ml_duplicate_btn" class="nj-skinned ml_duplicate_btn">Duplicate</button> |
| 125 | <button data-montage-id="ml_copy_btn" class="nj-skinned">Copy</button> | 126 | <button data-montage-id="ml_edit_btn" class="nj-skinned ml_edit_btn">Edit</button> |
| 126 | <button data-montage-id="ml_delete_btn" class="nj-skinned">Delete</button> | 127 | <button data-montage-id="ml_delete_btn" class="nj-skinned ml_delete_btn">Delete</button> |
| 127 | </div> | 128 | </div> |
| 128 | </div> | 129 | </div> |
| 129 | 130 | ||