aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
diff options
context:
space:
mode:
authorValerio Virgillito2012-04-27 14:21:35 -0700
committerValerio Virgillito2012-04-27 14:21:35 -0700
commitb08cc404d32dd1d4dbc2139ce8f06d7d88b681a8 (patch)
treeae45391131c7c5203ae8e0d3470d106d835c8c6b /js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
parent314709dd189807bfc762aa150bb1b29d2ccdf25b (diff)
parent6c1aa27b7753bc9007514859b42160fae265740d (diff)
downloadninja-b08cc404d32dd1d4dbc2139ce8f06d7d88b681a8.tar.gz
Merge branch 'refs/heads/serialization'
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.html17
1 files changed, 6 insertions, 11 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..741ff6aa 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/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"}