diff options
| author | Jonathan Duran | 2012-05-11 14:13:07 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-11 14:13:07 -0700 |
| commit | 1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2 (patch) | |
| tree | 2563aa7694c3caaf813ca71ef3250b2a76ee0041 /js/panels/Materials/materials-library-panel.reel/materials-library-panel.html | |
| parent | 32257ac142f872d3c1f6c07504bae77ae884ed93 (diff) | |
| parent | 6fcaa4e923a19672b5860b4c6f67d836680e7e99 (diff) | |
| download | ninja-1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2.tar.gz | |
Merge branch 'refs/heads/TimelineUber' into TimelineProps
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 | 16 |
1 files changed, 8 insertions, 8 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 741ff6aa..b5d7a869 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 | |||
| @@ -50,7 +50,7 @@ | |||
| 50 | "prototype": "js/panels/Materials/materials-popup.reel" | 50 | "prototype": "js/panels/Materials/materials-popup.reel" |
| 51 | }, | 51 | }, |
| 52 | "materialsController" : { | 52 | "materialsController" : { |
| 53 | "prototype": "js/controllers/tree-controller", | 53 | "prototype": "js/components/controllers/tree-controller", |
| 54 | "properties" : { | 54 | "properties" : { |
| 55 | "branchKey" : "children", | 55 | "branchKey" : "children", |
| 56 | "labelKey" : "label", | 56 | "labelKey" : "label", |
| @@ -88,15 +88,15 @@ | |||
| 88 | </head> | 88 | </head> |
| 89 | <body> | 89 | <body> |
| 90 | 90 | ||
| 91 | <div id="materials_library_panel" class="materials_library_panel"> | 91 | <div data-montage-id="materials_library_panel" class="materials_library_panel"> |
| 92 | <section id="ml_tree_holder" class="animationsLibrary"> | 92 | <section data-montage-id="ml_tree_holder" class="animationsLibrary"> |
| 93 | <div id="materials_library_tree"></div> | 93 | <div data-montage-id="materials_library_tree"></div> |
| 94 | </section> | 94 | </section> |
| 95 | <hr /> | 95 | <hr /> |
| 96 | <div id="ml_buttons"> | 96 | <div data-montage-id="ml_buttons" class="ml_buttons"> |
| 97 | <button id="ml_add_btn" class="nj-skinned">Add</button> | 97 | <button data-montage-id="ml_add_btn" class="nj-skinned">Add</button> |
| 98 | <button id="ml_copy_btn" class="nj-skinned">Copy</button> | 98 | <button data-montage-id="ml_copy_btn" class="nj-skinned">Copy</button> |
| 99 | <button id="ml_delete_btn" class="nj-skinned">Delete</button> | 99 | <button data-montage-id="ml_delete_btn" class="nj-skinned">Delete</button> |
| 100 | </div> | 100 | </div> |
| 101 | </div> | 101 | </div> |
| 102 | 102 | ||