No longer use the "Ok" button for file uploads

diff --git a/files/js/files.js b/files/js/files.js
index 9d05b3776fe0f13addcf96324c32be469a8718db..33573bfbbb9d283801b85c55ee32a843527df601 100644 (file)
--- 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 e2760d80da057ebcd12a724f99b5c39857c5d377..2ee3651836fb98a6148c9ae16c56a3659fa468ce 100644 (file)
--- 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>&nbsp;
-                       <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">