aboutsummaryrefslogtreecommitdiff
path: root/js/panels/components-panel.reel
diff options
context:
space:
mode:
authorEric Guzman2012-04-30 13:48:43 -0700
committerEric Guzman2012-04-30 13:48:43 -0700
commit23d8efd4ed9e8fd43f516595009679fb44c8096d (patch)
tree7d5be06e6417102702a49ece24fca82528aced7a /js/panels/components-panel.reel
parentae94b22c27b9b155e94bf140631e7faf8f55c6c0 (diff)
parentc8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff)
downloadninja-23d8efd4ed9e8fd43f516595009679fb44c8096d.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/panels/components-panel.reel')
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.html14
1 files changed, 5 insertions, 9 deletions
diff --git a/js/panels/components-panel.reel/components-panel.html b/js/panels/components-panel.reel/components-panel.html
index f598a1ee..c78988e0 100755
--- a/js/panels/components-panel.reel/components-panel.html
+++ b/js/panels/components-panel.reel/components-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/>
@@ -12,8 +12,7 @@
12 <script type="text/montage-serialization"> 12 <script type="text/montage-serialization">
13 { 13 {
14 "owner": { 14 "owner": {
15 "module": "js/panels/components-panel.reel", 15 "prototype": "js/panels/components-panel.reel",
16 "name": "ComponentsPanel",
17 "properties": { 16 "properties": {
18 "element": {"#": "components_panel"}, 17 "element": {"#": "components_panel"},
19 "controller": {"@": "componentsTree"} 18 "controller": {"@": "componentsTree"}
@@ -21,8 +20,7 @@
21 }, 20 },
22 21
23 "componentsController" : { 22 "componentsController" : {
24 "module": "js/components/controllers/tree-controller", 23 "prototype": "js/components/controllers/tree-controller",
25 "name": "TreeController",
26 "properties" : { 24 "properties" : {
27 "branchKey" : "children", 25 "branchKey" : "children",
28 "labelKey" : "text", 26 "labelKey" : "text",
@@ -37,8 +35,7 @@
37 }, 35 },
38 36
39 "componentsTree" : { 37 "componentsTree" : {
40 "module" : "js/components/treeview/treeview.reel", 38 "prototype" : "js/components/treeview/treeview.reel",
41 "name" : "Treeview",
42 "properties" : { 39 "properties" : {
43 "element" : {"#": "componentsContainer"}, 40 "element" : {"#": "componentsContainer"},
44 "branchComponent" : {"@": "branch" }, 41 "branchComponent" : {"@": "branch" },
@@ -48,8 +45,7 @@
48 }, 45 },
49 46
50 "branch" : { 47 "branch" : {
51 "module" : "js/components/treeview/ninja-branch.reel", 48 "prototype" : "js/components/treeview/ninja-branch.reel[Branch]"
52 "name" : "Branch"
53 } 49 }
54 } 50 }
55 </script> 51 </script>