aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
diff options
context:
space:
mode:
authorJon Reid2012-05-15 11:24:53 -0700
committerJon Reid2012-05-15 11:24:53 -0700
commit3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
treed6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
parent53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parente33a4e58c271a9507082694a5268b840fdd05968 (diff)
downloadninja-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/panels/Materials/materials-library-panel.reel/materials-library-panel.html')
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.html31
1 files changed, 13 insertions, 18 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 4e41512f..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
@@ -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/>
@@ -47,12 +47,10 @@
47 ] 47 ]
48 }, 48 },
49 "materialInfo": { 49 "materialInfo": {
50 "module": "js/panels/Materials/materials-popup.reel", 50 "prototype": "js/panels/Materials/materials-popup.reel"
51 "name": "MaterialsPopup"
52 }, 51 },
53 "materialsController" : { 52 "materialsController" : {
54 "module": "js/controllers/tree-controller", 53 "prototype": "js/components/controllers/tree-controller",
55 "name": "TreeController",
56 "properties" : { 54 "properties" : {
57 "branchKey" : "children", 55 "branchKey" : "children",
58 "labelKey" : "label", 56 "labelKey" : "label",
@@ -66,8 +64,7 @@
66 } 64 }
67 }, 65 },
68 "materialsContainer" : { 66 "materialsContainer" : {
69 "module" : "js/components/treeview/treeview.reel", 67 "prototype" : "js/components/treeview/treeview.reel",
70 "name" : "Treeview",
71 "properties" : { 68 "properties" : {
72 "element" : {"#": "materials_library_tree"}, 69 "element" : {"#": "materials_library_tree"},
73 "branchComponent" : {"@": "branch" }, 70 "branchComponent" : {"@": "branch" },
@@ -76,12 +73,10 @@
76 } 73 }
77 }, 74 },
78 "branch" : { 75 "branch" : {
79 "module" : "js/components/treeview/ninja-branch.reel", 76 "prototype" : "js/components/treeview/ninja-branch.reel[Branch]"
80 "name" : "Branch"
81 }, 77 },
82 "owner": { 78 "owner": {
83 "module": "js/panels/Materials/materials-library-panel.reel", 79 "prototype": "js/panels/Materials/materials-library-panel.reel[MaterialsLibraryPanels]",
84 "name": "MaterialsLibraryPanels",
85 "properties": { 80 "properties": {
86 "element": {"#": "materials_library_panel"}, 81 "element": {"#": "materials_library_panel"},
87 "_materialInfo": {"@": "materialInfo"} 82 "_materialInfo": {"@": "materialInfo"}
@@ -93,15 +88,15 @@
93 </head> 88 </head>
94 <body> 89 <body>
95 90
96 <div id="materials_library_panel" class="materials_library_panel"> 91 <div data-montage-id="materials_library_panel" class="materials_library_panel">
97 <section id="ml_tree_holder" class="animationsLibrary"> 92 <section data-montage-id="ml_tree_holder" class="animationsLibrary">
98 <div id="materials_library_tree"></div> 93 <div data-montage-id="materials_library_tree"></div>
99 </section> 94 </section>
100 <hr /> 95 <hr />
101 <div id="ml_buttons"> 96 <div data-montage-id="ml_buttons" class="ml_buttons">
102 <button id="ml_add_btn" class="nj-skinned">Add</button> 97 <button data-montage-id="ml_add_btn" class="nj-skinned">Add</button>
103 <button id="ml_copy_btn" class="nj-skinned">Copy</button> 98 <button data-montage-id="ml_copy_btn" class="nj-skinned">Copy</button>
104 <button id="ml_delete_btn" class="nj-skinned">Delete</button> 99 <button data-montage-id="ml_delete_btn" class="nj-skinned">Delete</button>
105 </div> 100 </div>
106 </div> 101 </div>
107 102