diff options
author | Eric Guzman | 2012-05-17 17:43:05 -0700 |
---|---|---|
committer | Eric Guzman | 2012-05-17 17:43:05 -0700 |
commit | 458a4598ed64e3d8c6010a216fb7fb4b3c3c87e7 (patch) | |
tree | ee329e409fe28ae54c894b9e27e82e1f85aefc85 /node_modules/montage/ui/autocomplete/results-list.reel/results-list.html | |
parent | 82954f400f7f8609aef0d2bc1f44c9d960907be6 (diff) | |
parent | 52394cdd71bd62c8c109fd135fa146b7183fbd1f (diff) | |
download | ninja-458a4598ed64e3d8c6010a216fb7fb4b3c3c87e7.tar.gz |
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
Conflicts:
js/document/templates/montage-html/default_html.css
js/lib/NJUtils.js
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 | 5 |
1 files changed, 3 insertions, 2 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 | ||