diff options
| author | Robin Appelman <icewind1991@gmail.com> | 2011-07-19 20:34:01 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind1991@gmail.com> | 2011-07-19 20:34:01 +0200 |
| commit | ff54602be06c5a949664d0eec2302075e60f44f7 (patch) | |
| tree | f18c5e8eb7522700f6439a7e49419ac03daee474 | |
| parent | b69ae10b7423b1753f15bd16e0ae9c8ca5d157e4 (diff) | |
| download | nextcloud-server-ff54602be06c5a949664d0eec2302075e60f44f7.tar.gz nextcloud-server-ff54602be06c5a949664d0eec2302075e60f44f7.zip | |
No longer use the "Ok" button for file uploads
| -rw-r--r-- | files/js/files.js | 12 | ||||
| -rw-r--r-- | files/templates/index.php | 1 |
2 files changed, 0 insertions, 13 deletions
diff --git a/files/js/files.js b/files/js/files.js index 9d05b3776fe..33573bfbbb9 100644 --- a/files/js/files.js +++ b/files/js/files.js @@ -142,14 +142,6 @@ $(document).ready(function() { }); $('#file_upload_start').change(function(){ - var filename=$(this).val(); - filename=filename.replace(/^.*[\/\\]/g, ''); - $('#file_upload_filename').val(filename); - $('#file_upload_submit').show(); - }) - - $('#file_upload_submit').click(function(){ - var name=$('#file_upload_filename').val(); var files=$('#file_upload_start')[0].files; $('#file_upload_target').load(function(){ var response=jQuery.parseJSON($('#file_upload_target').contents().find('body').text()); @@ -173,11 +165,7 @@ $(document).ready(function() { } FileList.addFile(files[i].name,size,uploadTime); } - $('#file_upload_filename').val($('#file_upload_filename').data('upload_text')); - $('#file_upload_submit').hide(); }); - //save the original upload button text - $('#file_upload_filename').data('upload_text',$('#file_upload_filename').val()); //add multiply file upload attribute to all browsers except konqueror (which crashes when it's used) if(navigator.userAgent.search(/konqueror/i)==-1){ diff --git a/files/templates/index.php b/files/templates/index.php index e2760d80da0..2ee3651836f 100644 --- a/files/templates/index.php +++ b/files/templates/index.php @@ -8,7 +8,6 @@ <input class="prettybutton" id='file_upload_filename' value="Upload (max. <?php echo $_["uploadMaxHumanFilesize"];?>)"/> <input class="prettybutton" type="file" id="file_upload_start" name='files[]'/> </div> - <input class="prettybutton" type="button" id="file_upload_submit" name="file_upload_submit" value="OK" /> <iframe id="file_upload_target" name="file_upload_target" src=""></iframe> </form> <form id="file_newfolder_form"> |