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/components-data/textfield.json | |
| 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/components-data/textfield.json')
| -rw-r--r-- | node_modules/components-data/textfield.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/node_modules/components-data/textfield.json b/node_modules/components-data/textfield.json index cb3f1c8f..d82723b7 100644 --- a/node_modules/components-data/textfield.json +++ b/node_modules/components-data/textfield.json | |||
| @@ -1,9 +1,9 @@ | |||
| 1 | { | 1 | { |
| 2 | "component": "textfield", | 2 | "component": "textfield", |
| 3 | 3 | ||
| 4 | "module": "montage/ui/textfield.reel", | 4 | "module": "montage/ui/native/input-text.reel", |
| 5 | 5 | ||
| 6 | "name": "Textfield", | 6 | "name": "InputText", |
| 7 | 7 | ||
| 8 | "properties": [ | 8 | "properties": [ |
| 9 | { | 9 | { |