diff options
author | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
commit | 6c8f3525b839e82cf43df43700a0160ee2c5458f (patch) | |
tree | 3fb801fa54b759c5568d75bb467e02652ce77c3e /node_modules/montage/ui/autocomplete/results-list.reel | |
parent | e8ae5db7ce7023b638375cbc27a3f7b7a2f77b23 (diff) | |
parent | 342c97ac9b727b22a7b0bfefca4d2a168bc3055b (diff) | |
download | ninja-6c8f3525b839e82cf43df43700a0160ee2c5458f.tar.gz |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
css/ninja.css
scss/imports/scss/_toolbar.scss
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/autocomplete/results-list.reel')
-rw-r--r-- | node_modules/montage/ui/autocomplete/results-list.reel/results-list.html | 5 | ||||
-rw-r--r-- | node_modules/montage/ui/autocomplete/results-list.reel/results-list.js | 7 |
2 files changed, 7 insertions, 5 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 73612736..2f904d62 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 | |||
@@ -32,12 +32,13 @@ | |||
32 | }, | 32 | }, |
33 | 33 | ||
34 | "resultItem": { | 34 | "resultItem": { |
35 | "prototype": "montage/ui/dynamic-text.reel", | 35 | "prototype": "montage/ui/autocomplete/result-item.reel", |
36 | "properties": { | 36 | "properties": { |
37 | "element": {"#": "result-item"} | 37 | "element": {"#": "result-item"} |
38 | }, | 38 | }, |
39 | "bindings": { | 39 | "bindings": { |
40 | "value": {"<-": "@repetition1.objectAtCurrentIteration"} | 40 | "textPropertyPath": {"<-": "@owner.textPropertyPath"}, |
41 | "object": {"<-": "@repetition1.objectAtCurrentIteration"} | ||
41 | } | 42 | } |
42 | }, | 43 | }, |
43 | 44 | ||
diff --git a/node_modules/montage/ui/autocomplete/results-list.reel/results-list.js b/node_modules/montage/ui/autocomplete/results-list.reel/results-list.js index 795e74e0..0950314d 100644 --- a/node_modules/montage/ui/autocomplete/results-list.reel/results-list.js +++ b/node_modules/montage/ui/autocomplete/results-list.reel/results-list.js | |||
@@ -7,10 +7,11 @@ var Montage = require("montage").Montage, | |||
7 | Component = require("ui/component").Component; | 7 | Component = require("ui/component").Component; |
8 | 8 | ||
9 | exports.ResultsList = Montage.create(Component, { | 9 | exports.ResultsList = Montage.create(Component, { |
10 | 10 | ||
11 | textPropertyPath: {value: null}, | ||
12 | |||
11 | // contentController -> this.repetition.contentController | 13 | // contentController -> this.repetition.contentController |
12 | contentController: {value: null}, | 14 | contentController: {value: null}, |
13 | |||
14 | activeIndexes: {value: null} | ||
15 | 15 | ||
16 | activeIndexes: {value: null} | ||
16 | }); | 17 | }); |