diff options
| author | Valerio Virgillito | 2012-04-26 17:09:12 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-04-26 17:09:12 -0700 |
| commit | 7968f3a9cf56392c914d6bd44cc90145b6d807a3 (patch) | |
| tree | b632e72735c9a071078121be07cf8cba2ebf29cc /js/panels/Materials/materials-library-panel.reel | |
| parent | b03c3b087297f471840ab8595d5aa8bd0249a742 (diff) | |
| parent | bcfb200482c26b2bfc0d6577b1eb0de7a19a6762 (diff) | |
| download | ninja-7968f3a9cf56392c914d6bd44cc90145b6d807a3.tar.gz | |
Merge branch 'master' of https://github.com/mayhewinator/ninja-internal into serialization
Diffstat (limited to 'js/panels/Materials/materials-library-panel.reel')
| -rwxr-xr-x | js/panels/Materials/materials-library-panel.reel/materials-library-panel.html | 17 |
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"} |