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 /js/io/ui/new-file-dialog | |
| 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 'js/io/ui/new-file-dialog')
| -rwxr-xr-x | js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html index f9a42887..0c410a47 100755 --- a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html +++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html | |||
| @@ -56,7 +56,7 @@ | |||
| 56 | }, | 56 | }, |
| 57 | 57 | ||
| 58 | "newFileName": { | 58 | "newFileName": { |
| 59 | "prototype": "montage/ui/textfield.reel", | 59 | "prototype": "montage/ui/input-text.reel", |
| 60 | "properties": { | 60 | "properties": { |
| 61 | "element": {"#": "newFileName"} | 61 | "element": {"#": "newFileName"} |
| 62 | } | 62 | } |