Changeset 37722

Timestamp:

06/16/2016 04:53:42 AM (9 years ago)

Author:

azaozz

Message:

Media: properly refresh the position of the Plupload shim so it moves over the Select Files button or off the screen. Fixes selecting files in MS Edge on the Media grid and Media -> Add New screens.

Fixes #37039.

Location:

trunk/src/wp-includes/js

Files:

• media-grid.js (modified) (1 diff)
• media/views/frame/manage.js (modified) (1 diff)
• plupload/handlers.js (modified) (2 diffs)
• plupload/wp-plupload.js (modified) (2 diffs)

trunk/src/wp-includes/js/media-grid.js

@@ -775 +775 @@
         event.preventDefault();
         this.trigger( 'toggle:upload:attachment' );
+
+        if ( this.uploader ) {
+            this.uploader.refresh();
+        }
     },
 

trunk/src/wp-includes/js/media/views/frame/manage.js

@@ -190 +190 @@
         event.preventDefault();
         this.trigger( 'toggle:upload:attachment' );
+
+        if ( this.uploader ) {
+            this.uploader.refresh();
+        }
     },
 

trunk/src/wp-includes/js/plupload/handlers.js

@@ -431 +431 @@
             if ( up.features.dragdrop && ! $(document.body).hasClass('mobile') ) {
                 uploaddiv.addClass('drag-drop');
-                $('#drag-drop-area').bind('dragover.wp-uploader', function(){ // dragenter doesn't fire right :(
+                $('#drag-drop-area').on('dragover.wp-uploader', function(){ // dragenter doesn't fire right :(
                     uploaddiv.addClass('drag-over');
-                }).bind('dragleave.wp-uploader, drop.wp-uploader', function(){
+                }).on('dragleave.wp-uploader, drop.wp-uploader', function(){
                     uploaddiv.removeClass('drag-over');
                 });
             } else {
                 uploaddiv.removeClass('drag-drop');
-                $('#drag-drop-area').unbind('.wp-uploader');
+                $('#drag-drop-area').off('.wp-uploader');
             }
 
@@ -444 +444 @@
                 $('.upload-flash-bypass').hide();
             }
+        });
+
+        uploader.bind( 'postinit', function( up ) {
+            up.refresh();
         });
 

trunk/src/wp-includes/js/plupload/wp-plupload.js

@@ -181 +181 @@
         });
 
+        this.uploader.bind( 'postinit', function( up ) {
+            up.refresh();
+            self.init();
+        });
+
         this.uploader.init();
 
@@ -312 +317 @@
         });
 
-        this.uploader.bind( 'PostInit', function() {
-            self.init();
-        });
     };