Changeset 3364:1ccfc95b40a3

Timestamp:

10/25/16 12:15:26 (9 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Keeps enhanced uploader buttons inline (media manager), fix #2211

File:

• admin/js/_media.js (modified) (3 diffs)

admin/js/_media.js

@@ -65 +65 @@
                     downloadTemplate: template_download
                }).bind('fileuploadadd', function(e, data) {
-                    $('.button.cancel','#fileupload .fileupload-buttonbar').show();
+                    $('.button.cancel').css('display','inline-block');
+                    $('#fileupload .fileupload-buttonbar').show();
                     enableButton($('.button.start','#fileupload .fileupload-buttonbar'));
                }).bind('fileuploadadded', function(e, data) {
@@ -74 +75 @@
                          $('#form-medias .hide').removeClass('hide');
                     }
-                    $('.button.clean',me).show();
+                    $('.button.clean').css('display','inline-block');
+                    $(me).show();
                }).bind('fileuploadalways', function(e, data) {
                     displayMessageInQueue($('.files .template-upload',me).length);
@@ -113 +115 @@
                          label = dotclear.jsUpload.msg.choose_files;
                          $('#upfile').attr('multiple', true);
-                         var startButton = $('.button.start','#fileupload .fileupload-buttonbar');
+                         var startButton = $('.button.start');
+                         var buttonBar = $('#fileupload .fileupload-buttonbar');
                          disableButton(startButton);
-                         startButton.show();
+                         disableButton(buttonBar);
+                         startButton.css('display','inline-block');
+                         buttonBar.show();
                          $(me).fileupload({disabled:false});
                          $('.queue-message',me).show();