diff options
| author | Jonathan Duran | 2012-06-20 15:04:45 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-20 15:04:45 -0700 |
| commit | c6ae80c488621d4ac189cb63309b6258115f823a (patch) | |
| tree | dfa26112e1830972fcb212bbb5b17c9a901c645f /js/io/ui/file-picker/file-input-field.reel/file-input-field.html | |
| parent | 022e714cb5d10cd8575ab9907eddfb184a990b66 (diff) | |
| parent | c9852665eadc1acb9c1c881d207c4bd9ef88805f (diff) | |
| download | ninja-c6ae80c488621d4ac189cb63309b6258115f823a.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate
Diffstat (limited to 'js/io/ui/file-picker/file-input-field.reel/file-input-field.html')
| -rwxr-xr-x | js/io/ui/file-picker/file-input-field.reel/file-input-field.html | 2 |
1 files changed, 1 insertions, 1 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 | } |