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.js | |
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.js')
-rw-r--r-- | node_modules/montage/ui/autocomplete/results-list.reel/results-list.js | 7 |
1 files changed, 4 insertions, 3 deletions
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 | }); |