diff options
| author | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
| commit | 2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch) | |
| tree | d352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /node_modules/montage/ui/autocomplete/results-list.reel/results-list.html | |
| parent | 244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff) | |
| parent | c59eb371559a3061ce53223e249ca97daace5968 (diff) | |
| download | ninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/document/document-html.js
js/document/templates/app/main.js
js/panels/Panel.reel/Panel.js
node_modules/montage/ui/native-control.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/autocomplete/results-list.reel/results-list.html')
| -rw-r--r-- | node_modules/montage/ui/autocomplete/results-list.reel/results-list.html | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/node_modules/montage/ui/autocomplete/results-list.reel/results-list.html b/node_modules/montage/ui/autocomplete/results-list.reel/results-list.html index 2f904d62..c40d36ce 100644 --- a/node_modules/montage/ui/autocomplete/results-list.reel/results-list.html +++ b/node_modules/montage/ui/autocomplete/results-list.reel/results-list.html | |||
| @@ -9,21 +9,20 @@ | |||
| 9 | { | 9 | { |
| 10 | 10 | ||
| 11 | "results": { | 11 | "results": { |
| 12 | "prototype": "montage/ui/controller/array-controller", | 12 | "prototype": "ui/controller/array-controller", |
| 13 | "properties": { | 13 | "properties": { |
| 14 | "selectObjectsOnAddition": true, | 14 | "selectObjectsOnAddition": true, |
| 15 | "automaticallyOrganizeObjects": true | 15 | "automaticallyOrganizeObjects": true |
| 16 | } | 16 | } |
| 17 | }, | 17 | }, |
| 18 | "repetition1": { | 18 | "repetition1": { |
| 19 | "prototype": "montage/ui/repetition.reel", | 19 | "prototype": "ui/repetition.reel", |
| 20 | "properties": { | 20 | "properties": { |
| 21 | "element": { | 21 | "element": { |
| 22 | "#": "repetition1" | 22 | "#": "repetition1" |
| 23 | }, | 23 | }, |
| 24 | "contentController": {"@": "results"}, | 24 | "contentController": {"@": "results"}, |
| 25 | "isSelectionEnabled": true, | 25 | "isSelectionEnabled": true |
| 26 | "orientation": "vertical" | ||
| 27 | }, | 26 | }, |
| 28 | "bindings": { | 27 | "bindings": { |
| 29 | "contentController": {"<-": "@owner.contentController"}, | 28 | "contentController": {"<-": "@owner.contentController"}, |
| @@ -32,7 +31,7 @@ | |||
| 32 | }, | 31 | }, |
| 33 | 32 | ||
| 34 | "resultItem": { | 33 | "resultItem": { |
| 35 | "prototype": "montage/ui/autocomplete/result-item.reel", | 34 | "prototype": "ui/autocomplete/result-item.reel", |
| 36 | "properties": { | 35 | "properties": { |
| 37 | "element": {"#": "result-item"} | 36 | "element": {"#": "result-item"} |
| 38 | }, | 37 | }, |
| @@ -43,7 +42,7 @@ | |||
| 43 | }, | 42 | }, |
| 44 | 43 | ||
| 45 | "owner": { | 44 | "owner": { |
| 46 | "prototype": "montage/ui/autocomplete/results-list.reel", | 45 | "prototype": "ui/autocomplete/results-list.reel", |
| 47 | "properties": { | 46 | "properties": { |
| 48 | "element": {"#": "results-list"} | 47 | "element": {"#": "results-list"} |
| 49 | } | 48 | } |