diff options
author | Jon Reid | 2012-06-20 15:05:26 -0700 |
---|---|---|
committer | Jon Reid | 2012-06-20 15:05:26 -0700 |
commit | 6e6c146f6e59c3942076b5d2f46b2962cc709926 (patch) | |
tree | aa6becc1e97aecbe6fb43aa33770def3c3de227d /js/io/ui | |
parent | f887a74a7d03a2008a2c43d455a2b3e9223028af (diff) | |
parent | c9852665eadc1acb9c1c881d207c4bd9ef88805f (diff) | |
download | ninja-6e6c146f6e59c3942076b5d2f46b2962cc709926.tar.gz |
Merge remote-tracking branch 'ninja-internal/master' into timeline-local
Diffstat (limited to 'js/io/ui')
3 files changed, 3 insertions, 3 deletions
diff --git a/js/io/ui/file-picker/file-input-field.reel/file-input-field.html b/js/io/ui/file-picker/file-input-field.reel/file-input-field.html index c3209654..ff165f9a 100755 --- a/js/io/ui/file-picker/file-input-field.reel/file-input-field.html +++ b/js/io/ui/file-picker/file-input-field.reel/file-input-field.html | |||
@@ -12,7 +12,7 @@ | |||
12 | { | 12 | { |
13 | 13 | ||
14 | "newFileDirectory": { | 14 | "newFileDirectory": { |
15 | "prototype": "montage/ui/textfield.reel", | 15 | "prototype": "montage/ui/input-text.reel", |
16 | "properties": { | 16 | "properties": { |
17 | "element": {"#": "newFileDirectory"} | 17 | "element": {"#": "newFileDirectory"} |
18 | } | 18 | } |
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 | } |
diff --git a/js/io/ui/save-as-dialog.reel/save-as-dialog.html b/js/io/ui/save-as-dialog.reel/save-as-dialog.html index dcdb073f..99f98ddb 100644 --- a/js/io/ui/save-as-dialog.reel/save-as-dialog.html +++ b/js/io/ui/save-as-dialog.reel/save-as-dialog.html | |||
@@ -18,7 +18,7 @@ | |||
18 | }, | 18 | }, |
19 | 19 | ||
20 | "newFileName": { | 20 | "newFileName": { |
21 | "prototype": "montage/ui/textfield.reel", | 21 | "prototype": "montage/ui/input-text.reel", |
22 | "properties": { | 22 | "properties": { |
23 | "element": {"#": "newFileName"} | 23 | "element": {"#": "newFileName"} |
24 | } | 24 | } |