diff options
author | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
commit | 65b989c7759af923fb9456d34bff89f91831ea1e (patch) | |
tree | e408be732a3eee71229bfc7dbf7cace998ce18de /node_modules/montage/ui/autocomplete/autocomplete.reel | |
parent | 38f571d1fdf02d36c3816637af7b2ca2493809da (diff) | |
parent | fc818d31de267d2b77fda3b3029ad38d48698be8 (diff) | |
download | ninja-65b989c7759af923fb9456d34bff89f91831ea1e.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
node_modules/montage/ui/application.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/autocomplete/autocomplete.reel')
-rw-r--r-- | node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.html | 13 | ||||
-rw-r--r-- | node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.js | 7 |
2 files changed, 16 insertions, 4 deletions
diff --git a/node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.html b/node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.html index 256804c7..404c49d9 100644 --- a/node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.html +++ b/node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.html | |||
@@ -1,10 +1,15 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <!-- <copyright> | ||
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/> | ||
5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
6 | </copyright> --> | ||
2 | <html> | 7 | <html> |
3 | <head> | 8 | <head> |
4 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> | 9 | <meta charset="utf-8"> |
5 | <title>Autocomplete Template</title> | 10 | <link rel="stylesheet" href="autocomplete.css"> |
6 | <link rel="stylesheet" type="text/css" href="autocomplete.css"> | 11 | <link rel="stylesheet" href="../../input-text.reel/input-text.css"> |
7 | </head> | 12 | </head> |
8 | <body> | 13 | <body> |
9 | </body> | 14 | </body> |
10 | </html> | 15 | </html> \ No newline at end of file |
diff --git a/node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.js b/node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.js index 4e2dd82e..b5431891 100644 --- a/node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.js +++ b/node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.js | |||
@@ -50,6 +50,13 @@ var Autocomplete = exports.Autocomplete = Montage.create(TextInput, { | |||
50 | 50 | ||
51 | hasTemplate: {value: true}, | 51 | hasTemplate: {value: true}, |
52 | 52 | ||
53 | didSetElement: { | ||
54 | value: function() { | ||
55 | TextInput.didSetElement.call(this); | ||
56 | this['class'] = (this['class'] || '') + ' montage-inputText'; | ||
57 | } | ||
58 | }, | ||
59 | |||
53 | delegate: { | 60 | delegate: { |
54 | value: null | 61 | value: null |
55 | }, | 62 | }, |