diff options
author | Ananya Sen | 2012-05-01 13:39:30 -0700 |
---|---|---|
committer | Ananya Sen | 2012-05-01 13:39:30 -0700 |
commit | c360d1a5cfe894591ae65f892ead11d0ca537b18 (patch) | |
tree | 13964f810d3516dbc02e27ab5bb576fe62366f26 /js/components/treeview | |
parent | 3137d919e6b4ccbb2fb68c5920f4376acde3f1f5 (diff) | |
parent | e3fa4c7db57b63c5ac604c9420062de5d0fe413a (diff) | |
download | ninja-c360d1a5cfe894591ae65f892ead11d0ca537b18.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
Diffstat (limited to 'js/components/treeview')
5 files changed, 28 insertions, 51 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": { |
diff --git a/js/components/treeview/leaf.reel/leaf.html b/js/components/treeview/leaf.reel/leaf.html index cf0b4e40..360b85a9 100644 --- a/js/components/treeview/leaf.reel/leaf.html +++ b/js/components/treeview/leaf.reel/leaf.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,16 +11,14 @@ 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/leaf.reel", | 14 | "prototype" : "js/components/treeview/leaf.reel", |
15 | "name" : "Leaf", | ||
16 | "properties" : { | 15 | "properties" : { |
17 | "element" : {"#" : "leaf"}, | 16 | "element" : {"#" : "leaf"}, |
18 | "label" : { "@" : "textComponent" } | 17 | "label" : { "@" : "textComponent" } |
19 | } | 18 | } |
20 | }, | 19 | }, |
21 | "textComponent" : { | 20 | "textComponent" : { |
22 | "module" : "montage/ui/dynamic-text.reel", | 21 | "prototype" : "montage/ui/dynamic-text.reel", |
23 | "name" : "DynamicText", | ||
24 | "properties" : { | 22 | "properties" : { |
25 | "element" : { "#" : "label" } | 23 | "element" : { "#" : "label" } |
26 | }, | 24 | }, |
diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.html b/js/components/treeview/ninja-branch.reel/ninja-branch.html index 13f1c575..3a3f3658 100644 --- a/js/components/treeview/ninja-branch.reel/ninja-branch.html +++ b/js/components/treeview/ninja-branch.reel/ninja-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/ninja-branch.reel", | 14 | "prototype" : "js/components/treeview/ninja-branch.reel[Branch]", |
15 | "name" : "Branch", | ||
16 | "properties" : { | 15 | "properties" : { |
17 | "element" : {"#" : "branch"}, | 16 | "element" : {"#" : "branch"}, |
18 | "label" : { "@" : "textComponent" }, | 17 | "label" : { "@" : "textComponent" }, |
@@ -26,8 +25,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
26 | }, | 25 | }, |
27 | 26 | ||
28 | "textComponent" : { | 27 | "textComponent" : { |
29 | "module" : "montage/ui/dynamic-text.reel", | 28 | "prototype" : "montage/ui/dynamic-text.reel", |
30 | "name" : "DynamicText", | ||
31 | "properties" : { | 29 | "properties" : { |
32 | "element" : { "#" : "label" } | 30 | "element" : { "#" : "label" } |
33 | }, | 31 | }, |
@@ -41,8 +39,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
41 | }, | 39 | }, |
42 | 40 | ||
43 | "arrayController": { | 41 | "arrayController": { |
44 | "module": "montage/ui/controller/array-controller", | 42 | "prototype": "montage/ui/controller/array-controller", |
45 | "name": "ArrayController", | ||
46 | "bindings": { | 43 | "bindings": { |
47 | "content": { | 44 | "content": { |
48 | "boundObject": {"@": "owner"}, | 45 | "boundObject": {"@": "owner"}, |
@@ -52,8 +49,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
52 | }, | 49 | }, |
53 | 50 | ||
54 | "leaf": { | 51 | "leaf": { |
55 | "module": "js/components/treeview/ninja-leaf.reel", | 52 | "prototype": "js/components/treeview/ninja-leaf.reel[Leaf]", |
56 | "name": "Leaf", | ||
57 | "bindings": { | 53 | "bindings": { |
58 | "sourceObject": { | 54 | "sourceObject": { |
59 | "boundObject": {"@": "repetition" }, | 55 | "boundObject": {"@": "repetition" }, |
@@ -79,8 +75,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
79 | }, | 75 | }, |
80 | 76 | ||
81 | "branch": { | 77 | "branch": { |
82 | "module": "js/components/treeview/ninja-branch.reel", | 78 | "prototype": "js/components/treeview/ninja-branch.reel[Branch]", |
83 | "name": "Branch", | ||
84 | "bindings": { | 79 | "bindings": { |
85 | "sourceObject": { | 80 | "sourceObject": { |
86 | "boundObject": {"@": "repetition" }, | 81 | "boundObject": {"@": "repetition" }, |
@@ -106,8 +101,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
106 | }, | 101 | }, |
107 | 102 | ||
108 | "repetition": { | 103 | "repetition": { |
109 | "module": "montage/ui/repetition.reel", | 104 | "prototype": "montage/ui/repetition.reel", |
110 | "name": "Repetition", | ||