diff options
author | Pushkar Joshi | 2012-04-27 15:05:38 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-04-27 15:05:38 -0700 |
commit | c8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc (patch) | |
tree | 74fcb9818a917d4f8ddb0db0c78a8cff9af86339 /js/components/treeview/branch.reel | |
parent | 28d1594b868e3c08e5603adbd5b29df1e24d57e9 (diff) | |
parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
download | ninja-c8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc.tar.gz |
Merge branch 'master' into pentool
Diffstat (limited to 'js/components/treeview/branch.reel')
-rw-r--r-- | js/components/treeview/branch.reel/branch.html | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/js/components/treeview/branch.reel/branch.html b/js/components/treeview/branch.reel/branch.html index b44a54c5..97b03382 100644 --- a/js/components/treeview/branch.reel/branch.html +++ b/js/components/treeview/branch.reel/branch.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/> |
@@ -11,8 +11,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
12 | { | 12 | { |
13 | "owner": { | 13 | "owner": { |
14 | "module" : "js/components/treeview/branch.reel", | 14 | "prototype" : "js/components/treeview/branch.reel", |
15 | "name" : "Branch", | ||
16 | "properties" : { | 15 | "properties" : { |
17 | "element" : {"#" : "branch"}, | 16 | "element" : {"#" : "branch"}, |
18 | "label" : { "@" : "textComponent" }, | 17 | "label" : { "@" : "textComponent" }, |
@@ -25,8 +24,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
25 | }, | 24 | }, |
26 | 25 | ||
27 | "textComponent" : { | 26 | "textComponent" : { |
28 | "module" : "montage/ui/dynamic-text.reel", | 27 | "prototype" : "montage/ui/dynamic-text.reel", |
29 | "name" : "DynamicText", | ||
30 | "properties" : { | 28 | "properties" : { |
31 | "element" : { "#" : "label" } | 29 | "element" : { "#" : "label" } |
32 | }, | 30 | }, |
@@ -40,8 +38,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
40 | }, | 38 | }, |
41 | 39 | ||
42 | "arrayController": { | 40 | "arrayController": { |
43 | "module": "montage/ui/controller/array-controller", | 41 | "prototype": "montage/ui/controller/array-controller", |
44 | "name": "ArrayController", | ||
45 | "bindings": { | 42 | "bindings": { |
46 | "content": { | 43 | "content": { |
47 | "boundObject": {"@": "owner"}, | 44 | "boundObject": {"@": "owner"}, |
@@ -51,8 +48,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
51 | }, | 48 | }, |
52 | 49 | ||
53 | "leaf": { | 50 | "leaf": { |
54 | "module": "js/components/treeview/leaf.reel", | 51 | "prototype": "js/components/treeview/leaf.reel", |
55 | "name": "Leaf", | ||
56 | "bindings": { | 52 | "bindings": { |
57 | "sourceObject": { | 53 | "sourceObject": { |
58 | "boundObject": {"@": "repetition" }, | 54 | "boundObject": {"@": "repetition" }, |
@@ -78,8 +74,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
78 | }, | 74 | }, |
79 | 75 | ||
80 | "branch": { | 76 | "branch": { |
81 | "module": "js/components/treeview/branch.reel", | 77 | "prototype": "js/components/treeview/branch.reel", |
82 | "name": "Branch", | ||
83 | "bindings": { | 78 | "bindings": { |
84 | "sourceObject": { | 79 | "sourceObject": { |
85 | "boundObject": {"@": "repetition" }, | 80 | "boundObject": {"@": "repetition" }, |
@@ -105,8 +100,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
105 | }, | 100 | }, |
106 | 101 | ||
107 | "repetition": { | 102 | "repetition": { |
108 | "module": "montage/ui/repetition.reel", | 103 | "prototype": "montage/ui/repetition.reel", |
109 | "name": "Repetition", | ||
110 | "properties": { | 104 | "properties": { |
111 | "element": { "#": "branchList" }, | 105 | "element": { "#": "branchList" }, |
112 | "contentController": {"@": "arrayController" } | 106 | "contentController": {"@": "arrayController" } |
@@ -114,8 +108,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
114 | }, | 108 | }, |
115 | 109 | ||
116 | "substitution": { | 110 | "substitution": { |
117 | "module": "montage/ui/substitution.reel", | 111 | "prototype": "montage/ui/substitution.reel", |
118 | "name": "Substitution", | ||
119 | "properties": { | 112 | "properties": { |
120 | "element": {"#": "treeItem"}, | 113 | "element": {"#": "treeItem"}, |
121 | "switchComponents": { | 114 | "switchComponents": { |