diff options
| author | Jose Antonio Marquez | 2012-06-20 16:48:34 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-06-20 16:48:34 -0700 |
| commit | 4eff115126ab946c5852d787fd596e07b156c9a5 (patch) | |
| tree | f7d45b260f2fb5ba5dc4d1879076ca032d5ae2e6 /js/io/ui | |
| parent | 7615da5c6ba54bd082eac4b8a6d9196084e5c590 (diff) | |
| parent | 392a559e90357d48c910a07617261483b2b45476 (diff) | |
| download | ninja-4eff115126ab946c5852d787fd596e07b156c9a5.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into Color
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 | } |