<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[28262] branches/3.9: Drag/drop on the editor to upload: don't trigger the uploader when selected text is being dragged from one window to another.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/28262">28262</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-05-06 03:27:02 +0000 (Tue, 06 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Drag/drop on the editor to upload: don't trigger the uploader when selected text is being dragged from one window to another.
Merges <a href="http://core.trac.wordpress.org/changeset/28189">[28189]</a> to the 3.9 branch.
props azaozz.
fixes <a href="http://core.trac.wordpress.org/ticket/27880">#27880</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches39srcwpincludesjsmediaviewsjs">branches/3.9/src/wp-includes/js/media-views.js</a></li>
<li><a href="#branches39srcwpincludesjstinymcepluginswordpresspluginjs">branches/3.9/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches39">branches/3.9/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx">Index: branches/3.9
</span><span class="cx">===================================================================
</span><del>--- branches/3.9 2014-05-06 03:21:56 UTC (rev 28261)
</del><ins>+++ branches/3.9 2014-05-06 03:27:02 UTC (rev 28262)
</ins><a id="branches39"></a>
<div class="propset"><h4>Property changes: branches/3.9</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> /branches/3.1:18031
</span><span class="cx"> /branches/3.3:20543
</span><span class="cx"> /branches/3.4:21757
</span><del>-/trunk:18512,28158,28161,28163,28165-28166,28168,28171-28174,28176-28181,28184-28187,28190-28191,28193-28195,28203,28219,28223
</del><ins>+/trunk:18512,28158,28161,28163,28165-28166,28168,28171-28174,28176-28181,28184-28187,28189-28191,28193-28195,28203,28219,28223
</ins><span class="cx">\ No newline at end of property
</span><a id="branches39srcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: branches/3.9/src/wp-includes/js/media-views.js (28261 => 28262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.9/src/wp-includes/js/media-views.js 2014-05-06 03:21:56 UTC (rev 28261)
+++ branches/3.9/src/wp-includes/js/media-views.js 2014-05-06 03:27:02 UTC (rev 28262)
</span><span class="lines">@@ -3270,6 +3270,7 @@
</span><span class="cx"> localDrag: false,
</span><span class="cx"> overContainer: false,
</span><span class="cx"> overDropzone: false,
</span><ins>+ draggingFile: null,
</ins><span class="cx">
</span><span class="cx"> initialize: function() {
</span><span class="cx"> var self = this;
</span><span class="lines">@@ -3309,6 +3310,21 @@
</span><span class="cx"> return supports;
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ isDraggingFile: function( event ) {
+ if ( this.draggingFile !== null ) {
+ return this.draggingFile;
+ }
+
+ if ( _.isUndefined( event.originalEvent ) || _.isUndefined( event.originalEvent.dataTransfer ) ) {
+ return false;
+ }
+
+ this.draggingFile = _.indexOf( event.originalEvent.dataTransfer.types, 'Files' ) > -1 &&
+ _.indexOf( event.originalEvent.dataTransfer.types, 'text/plain' ) === -1;
+
+ return this.draggingFile;
+ },
+
</ins><span class="cx"> refresh: function( e ) {
</span><span class="cx"> var dropzone_id;
</span><span class="cx"> for ( dropzone_id in this.dropzones ) {
</span><span class="lines">@@ -3320,6 +3336,10 @@
</span><span class="cx"> $( e.target ).closest( '.uploader-editor' ).toggleClass( 'droppable', this.overDropzone );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( ! this.overContainer && ! this.overDropzone ) {
+ this.draggingFile = null;
+ }
+
</ins><span class="cx"> return this;
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -3383,8 +3403,8 @@
</span><span class="cx"> return this;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- containerDragover: function() {
- if ( this.localDrag ) {
</del><ins>+ containerDragover: function( event ) {
+ if ( this.localDrag || ! this.isDraggingFile( event ) ) {
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3399,13 +3419,13 @@
</span><span class="cx"> _.delay( _.bind( this.refresh, this ), 50 );
</span><span class="cx"> },
</span><span class="cx">
</span><del>- dropzoneDragover: function( e ) {
- if ( this.localDrag ) {
</del><ins>+ dropzoneDragover: function( event ) {
+ if ( this.localDrag || ! this.isDraggingFile( event ) ) {
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this.overDropzone = true;
</span><del>- this.refresh( e );
</del><ins>+ this.refresh( event );
</ins><span class="cx"> return false;
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre></div>
<a id="branches39srcwpincludesjstinymcepluginswordpresspluginjs"></a>
<div class="modfile"><h4>Modified: branches/3.9/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js (28261 => 28262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.9/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2014-05-06 03:21:56 UTC (rev 28261)
+++ branches/3.9/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2014-05-06 03:27:02 UTC (rev 28262)
</span><span class="lines">@@ -317,7 +317,7 @@
</span><span class="cx"> dom.bind( doc, 'dragstart dragend dragover drop', function( event ) {
</span><span class="cx"> if ( typeof window.jQuery !== 'undefined' ) {
</span><span class="cx"> // Trigger the jQuery handlers.
</span><del>- window.jQuery( document ).triggerHandler( event.type );
</del><ins>+ window.jQuery( document ).trigger( new window.jQuery.Event( event ) );
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>