Ticket #19845: 19845.5.diff

src/wp-includes/js/media-views.js

@@ -2806 +2806 @@
                 tagName:   'div',
                 className: 'uploader-editor',
                 template:  media.template( 'uploader-editor' ),
+                _localDrag: false,
 
                 initialize: function() {
+                        var self = this;
+
                         this.$document = $(document);
                         this.dropzones = [];
                         this.files = [];
@@ -2819 +2822 @@
                         this.$document.on( 'dragover', _.bind( this.containerDragover, this ) );
                         this.$document.on( 'dragleave', _.bind( this.containerDragleave, this ) );
 
+                        this.$document.on( 'dragstart', function() {
+                                self._localDrag = true;
+                        });
+
+                        this.$document.on( 'dragend', function() {
+                                self._localDrag = false;
+                        });
+
                         return this;
                 },
 
@@ -2887 +2898 @@
                 },
 
                 containerDragover: function() {
-                        this.overContainer = true;
-                        this.refresh();
+                        if ( ! this._localDrag ) {
+                                this.overContainer = true;
+                                this.refresh();
+                        }
                 },
 
                 containerDragleave: function() {
@@ -2899 +2912 @@
                 },
 
                 dropzoneDragover: function( e ) {
-                        $( e.target ).addClass( 'droppable' );
-                        this.overDropzone = true;
-                        _.defer( _.bind( this.refresh, this ) );
-                        return false;
+                        if ( ! this._localDrag ) {
+                                $( e.target ).addClass( 'droppable' );
+                                this.overDropzone = true;
+                                _.defer( _.bind( this.refresh, this ) );
+                                return false;
+                        }
                 },
 
                 dropzoneDragleave: function( e ) {

src/wp-includes/js/tinymce/plugins/wordpress/plugin.js

@@ -1 @@
-/* global tinymce, getUserSetting, setUserSetting, switchEditors */
+/* global tinymce, getUserSetting, setUserSetting */
 tinymce.PluginManager.add( 'wordpress', function( editor ) {
         var DOM = tinymce.DOM, wpAdvButton, modKey, style,
                 last = 0;
@@ -276 +276 @@
         });
 
         editor.on( 'init', function() {
-                var env = tinymce.Env, topx, reset,
+                var env = tinymce.Env, topx, reset, localDrag,
                         deltax = 0,
                         bodyClass = ['mceContentBody'], // back-compat for themes that use this in editor-style.css...
-                        doc = editor.getDoc();
+                        doc = editor.getDoc(),
+                        dom = editor.dom;
 
                 if ( editor.getParam( 'directionality' ) === 'rtl' ) {
                         bodyClass.push('rtl');
@@ -299 +300 @@
 
                 tinymce.each( bodyClass, function( cls ) {
                         if ( cls ) {
-                                editor.dom.addClass( doc.body, cls );
+                                dom.addClass( doc.body, cls );
                         }
                 });
 
@@ -318 +319 @@
 
                 if ( ! ( 'ontouchstart' in window ) ) {
                         // When scrolling with mouse wheel or trackpad inside the editor, don't scroll the parent window
-                        editor.dom.bind( doc, 'onwheel' in doc ? 'wheel' : 'mousewheel', function( event ) {
+                        dom.bind( doc, 'onwheel' in doc ? 'wheel' : 'mousewheel', function( event ) {
                                 var delta, top,
                                         docElement = doc.documentElement;
 
@@ -370 +371 @@
                                 event.preventDefault();
                         });
                 }
+
+                dom.bind( doc, 'dragstart', function() {
+                        localDrag = true;
+                });
+
+                dom.bind( doc, 'dragend', function() {
+                        localDrag = false;
+                });
+
+                dom.bind( doc, 'dragover', function( event ) {
+                        if ( ! localDrag && typeof window.jQuery !== 'undefined' ) {
+                                // Propagate the event to its container for the parent window to catch.
+                                window.jQuery( editor.getContainer() ).trigger( event );
+                        }
+                });
         });
 
         // Word count
@@ -399 +415 @@
                 // Keep empty paragraphs :(
                 e.content = e.content.replace( /<p>(<br ?\/?>|\u00a0|\uFEFF)?<\/p>/g, '<p>&nbsp;</p>' );
 
-                if ( editor.getParam( 'wpautop', true ) && typeof switchEditors !== 'undefined' ) {
-                        e.content = switchEditors.pre_wpautop( e.content );
+                if ( editor.getParam( 'wpautop', true ) && typeof window.switchEditors !== 'undefined' ) {
+                        e.content = window.switchEditors.pre_wpautop( e.content );
                 }
         });
 
@@ -443 +459 @@
                 editor.dom.bind( editor.getBody(), 'dragstart', function() {
                         _hideButtons();
                 });
-
-                editor.dom.bind( editor.getWin(), 'dragover', function(e) {
-                        if ( typeof window.jQuery !== 'undefined' ) {
-                                // Propagate the event to its container for the parent window to catch.
-                                jQuery( editor.getContainer() ).trigger(e);
-                        }
-                });
         });
 
         editor.on( 'BeforeExecCommand', function() {