Changeset 1164:3c875b7b697a

Timestamp:

07/03/13 14:49:04 (11 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Small fix for buttons on enhanced upload.

Location:

admin

Files:

• js/_media.js (modified) (2 diffs)
• media.php (modified) (1 diff)
• style/jsUpload/style.css (modified) (1 diff)

admin/js/_media.js

@@ -10 +10 @@
      });
 
-     $('button.clean').click(function(e) {
-          $('.fileupload-ctrl .files .upload-file', '#fileupload').slideUp(500);
+     $('.button.cancel', '#fileupload').click(function(e) {
+      $(this).hide();
+     });
+
+     $('.button.clean', '#fileupload').click(function(e) {
+          $('.fileupload-ctrl .files .upload-file', '#fileupload').slideUp(500, function() {
+               $(this).remove();
+          });
           $(this).remove();
+          $('.button.cancel','#fileupload').hide();
           e.preventDefault();
      });
@@ -20 +27 @@
           autoUpload: false,
           disabled: true
+     }).bind('fileuploadadd', function(e, data) {
+          $('.button.cancel').show();
      }).bind('fileuploaddone', function(e, data) {
           if (data.result.files[0].html !==undefined) {
                $('.media-list p.clear').before(data.result.files[0].html);
           }
-          $('button.clean').show();
+          $('.button.clean','#fileupload').show();
      });
 

admin/media.php

@@ -366 +366 @@
      echo
      '<button class="button clean">'.__('Clean').'</button>'.
-     '<input class="button cancel" type="reset" value="'.__('Cancel').'"/>'.
+     '<input class="button cancel one-file" type="reset" value="'.__('Cancel').'"/>'.
      '<input class="button start" type="submit" value="'.__('Send').'"/>'.
      '</div>';

admin/style/jsUpload/style.css

@@ -42 +42 @@
 }
 
-.enhanced_uploader .button.clean, .enhanced_uploader .button.cancel, .enhanced_uploader .button.add {
+.enhanced_uploader .button.add {
   display: inline-block;
 }