Changeset 21630

Timestamp:

08/27/12 22:20:23 (20 months ago)

Author:

koopersmith

Message:

Allow elements within a wp.Uploader dropzone to be repositioned when the drag-over class is added. fixes #21705.

File:

• trunk/wp-includes/js/plupload/wp-plupload.js (modified) (4 diffs)

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

@@ -12 +12 @@
      *
      * @param options - object - The options passed to the new plupload instance.
-     *    Requires the following parameters:
+     *    Accepts the following parameters:
      *    - container - The id of uploader container.
      *    - browser   - The id of button to trigger the file select.
@@ -87 +87 @@
         // Generate drag/drop helper classes.
         (function( dropzone, supported ) {
-            var sensitivity = 50,
-                active;
+            var timer, active;
 
             if ( ! dropzone )
@@ -101 +100 @@
             // simulate it with a limited 'dragover'
             dropzone.bind( 'dragover.wp-uploader', function(){
+                if ( timer )
+                    clearTimeout( timer );
+
                 if ( active )
                     return;
@@ -109 +111 @@
 
             dropzone.bind('dragleave.wp-uploader, drop.wp-uploader', function(){
-                active = false;
-                dropzone.removeClass('drag-over');
+                // Using an instant timer prevents the drag-over class from
+                // being quickly removed and re-added when elements inside the
+                // dropzone are repositioned.
+                //
+                // See http://core.trac.wordpress.org/ticket/21705
+                timer = setTimeout( function() {
+                    active = false;
+                    dropzone.removeClass('drag-over');
+                }, 0 );
             });
         }( this.dropzone, this.supports.dragdrop ));