diff options
| author | Valerio Virgillito | 2012-03-20 13:38:42 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-03-20 13:38:42 -0700 |
| commit | 9facfb41b0b0f9fab9ddc9c8473af1d1d7e1ff18 (patch) | |
| tree | b6c35ce69c667f3ee8c16cc5e9a86021a4646288 /js/panels/Materials/materials-library-panel.reel/materials-library-panel.html | |
| parent | afe4b3d6567a35586e970682d71cba61c416e496 (diff) | |
| parent | 634358d2697d9668bb9406ac7a029aafae542285 (diff) | |
| download | ninja-9facfb41b0b0f9fab9ddc9c8473af1d1d7e1ff18.tar.gz | |
Merge pull request #129 from mqg734/WebGLMaterials
Added Montage button as a valid PI control and used it to invoke the edit material popup.
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 | 43 |
1 files changed, 36 insertions, 7 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 fe17d0f8..4e41512f 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 | |||
| @@ -46,10 +46,39 @@ | |||
| 46 | } | 46 | } |
| 47 | ] | 47 | ] |
| 48 | }, | 48 | }, |
| 49 | "materialInfo": { | 49 | "materialInfo": { |
| 50 | "module": "js/panels/Materials/materials-popup.reel", | 50 | "module": "js/panels/Materials/materials-popup.reel", |
| 51 | "name": "MaterialsPopup" | 51 | "name": "MaterialsPopup" |
| 52 | }, | 52 | }, |
| 53 | "materialsController" : { | ||
| 54 | "module": "js/controllers/tree-controller", | ||
| 55 | "name": "TreeController", | ||
| 56 | "properties" : { | ||
| 57 | "branchKey" : "children", | ||
| 58 | "labelKey" : "label", | ||
| 59 | "delegate": {"@": "owner" } | ||
| 60 | }, | ||
| 61 | "bindings": { | ||
| 62 | "content": { | ||
| 63 | "boundObject": {"@": "owner"}, | ||
| 64 | "boundObjectPropertyPath": "materialsData" | ||
| 65 | } | ||
| 66 | } | ||
| 67 | }, | ||
| 68 | "materialsContainer" : { | ||
| 69 | "module" : "js/components/treeview/treeview.reel", | ||
| 70 | "name" : "Treeview", | ||
| 71 | "properties" : { | ||
| 72 | "element" : {"#": "materials_library_tree"}, | ||
| 73 | "branchComponent" : {"@": "branch" }, | ||
| 74 | "contentController": {"@": "materialsController"}, | ||
| 75 | "showRoot": false | ||
| 76 | } | ||
| 77 | }, | ||
| 78 | "branch" : { | ||
| 79 | "module" : "js/components/treeview/ninja-branch.reel", | ||
| 80 | "name" : "Branch" | ||
| 81 | }, | ||
| 53 | "owner": { | 82 | "owner": { |
| 54 | "module": "js/panels/Materials/materials-library-panel.reel", | 83 | "module": "js/panels/Materials/materials-library-panel.reel", |
| 55 | "name": "MaterialsLibraryPanels", | 84 | "name": "MaterialsLibraryPanels", |
| @@ -65,9 +94,9 @@ | |||
| 65 | <body> | 94 | <body> |
| 66 | 95 | ||
| 67 | <div id="materials_library_panel" class="materials_library_panel"> | 96 | <div id="materials_library_panel" class="materials_library_panel"> |
| 68 | <div id="ml_tree_holder"> | 97 | <section id="ml_tree_holder" class="animationsLibrary"> |
| 69 | <ul id="materials_library_tree"></ul> | 98 | <div id="materials_library_tree"></div> |
| 70 | </div> | 99 | </section> |
| 71 | <hr /> | 100 | <hr /> |
| 72 | <div id="ml_buttons"> | 101 | <div id="ml_buttons"> |
| 73 | <button id="ml_add_btn" class="nj-skinned">Add</button> | 102 | <button id="ml_add_btn" class="nj-skinned">Add</button> |