<!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>[27343] trunk/src: Add the ability to drag and drop files directly onto the editor.</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/27343">27343</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-03-01 21:33:36 +0000 (Sat, 01 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add the ability to drag and drop files directly onto the editor.
The file will then begin to upload and the media manager will open.
props kovshenin.
see <a href="http://core.trac.wordpress.org/ticket/19845">#19845</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsseditcss">trunk/src/wp-admin/css/edit.css</a></li>
<li><a href="#trunksrcwpincludesjsmediaeditorjs">trunk/src/wp-includes/js/media-editor.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media-views.js</a></li>
<li><a href="#trunksrcwpincludesjspluploadwppluploadjs">trunk/src/wp-includes/js/plupload/wp-plupload.js</a></li>
<li><a href="#trunksrcwpincludesmediatemplatephp">trunk/src/wp-includes/media-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsseditcss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/edit.css (27342 => 27343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/edit.css 2014-03-01 14:59:53 UTC (rev 27342)
+++ trunk/src/wp-admin/css/edit.css 2014-03-01 21:33:36 UTC (rev 27343)
</span><span class="lines">@@ -593,9 +593,54 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .edit-form-section {
</span><del>- margin-bottom: 20px;
</del><ins>+ margin-bottom: 20px;
+ position: relative;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+.uploader-editor {
+ background: rgba( 150, 150, 150, 0.9 );
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ z-index: 250000;
+ display: none;
+ text-align: center;
+}
+
+.uploader-editor-content {
+ border: 1px dashed #fff;
+ position: absolute;
+ top: 10px;
+ left: 10px;
+ right: 10px;
+ bottom: 10px;
+ pointer-events: none;
+}
+
+#poststuff .uploader-editor-content h3 {
+ margin: -0.5em 0 0;
+ position: absolute;
+ top: 50%;
+ left: 0;
+ right: 0;
+ transform: translateY( -50% );
+ font-size: 40px;
+ color: #fff;
+ padding: 0;
+ display: none;
+ pointer-events: none;
+}
+
+.uploader-editor.droppable {
+ background: rgba( 0, 86, 132, 0.9 );
+}
+
+#poststuff .uploader-editor.droppable h3 {
+ display: block;
+}
+
</ins><span class="cx"> /* TinyMCE */
</span><span class="cx"> #mce_fullscreen_container {
</span><span class="cx"> background: #fff;
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaeditorjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-editor.js (27342 => 27343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-editor.js 2014-03-01 14:59:53 UTC (rev 27342)
+++ trunk/src/wp-includes/js/media-editor.js 2014-03-01 21:33:36 UTC (rev 27343)
</span><span class="lines">@@ -1030,6 +1030,9 @@
</span><span class="cx">
</span><span class="cx"> wp.media.editor.open( editor, options );
</span><span class="cx"> });
</span><ins>+
+ // Initialize and render the Editor drag-and-drop uploader.
+ new wp.media.view.EditorUploader().render();
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (27342 => 27343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-03-01 14:59:53 UTC (rev 27342)
+++ trunk/src/wp-includes/js/media-views.js 2014-03-01 21:33:36 UTC (rev 27343)
</span><span class="lines">@@ -2781,8 +2781,14 @@
</span><span class="cx"> dropzone = this.uploader.dropzone;
</span><span class="cx"> dropzone.on( 'dropzone:enter', _.bind( this.show, this ) );
</span><span class="cx"> dropzone.on( 'dropzone:leave', _.bind( this.hide, this ) );
</span><ins>+
+ $( this.uploader ).on( 'uploader:ready', _.bind( this._ready, this ) );
</ins><span class="cx"> },
</span><span class="cx">
</span><ins>+ _ready: function() {
+ this.controller.trigger( 'uploader:ready' );
+ },
+
</ins><span class="cx"> show: function() {
</span><span class="cx"> var $el = this.$el.show();
</span><span class="cx">
</span><span class="lines">@@ -2807,6 +2813,103 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * wp.media.view.EditorUploader
+ *
+ * @constructor
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+ media.view.EditorUploader = media.View.extend({
+ tagName: 'div',
+ className: 'uploader-editor',
+ template: media.template( 'uploader-editor' ),
+
+ events: {
+ 'drop': 'drop',
+ 'dragover': 'dropzoneDragover',
+ 'dragleave': 'dropzoneDragleave',
+ },
+
+ initialize: function() {
+ this.files = [];
+ this.$document = $(document);
+ this.$document.on( 'dragover', _.bind( this.containerDragover, this ) );
+ this.$document.on( 'dragleave', _.bind( this.containerDragleave, this ) );
+ return this;
+ },
+
+ refresh: function() {
+ // Hide the dropzone only if dragging has left the screen.
+ return this.$el.toggle( this.overContainer || this.overDropzone );
+ },
+
+ render: function() {
+ media.View.prototype.render.apply( this, arguments );
+ $( '.edit-form-section' ).append( this.$el );
+ return this;
+ },
+
+ drop: function( event ) {
+ this.files = event.originalEvent.dataTransfer.files;
+ if ( this.files.length < 1 )
+ return;
+
+ this.containerDragleave();
+ this.dropzoneDragleave();
+
+ if ( ! this.workflow ) {
+ this.workflow = wp.media.editor.open( 'content', {
+ frame: 'post',
+ state: 'insert',
+ title: wp.media.view.l10n.addMedia,
+ multiple: true
+ });
+ this.workflow.on( 'uploader:ready', this.addFiles, this );
+ } else {
+ this.workflow.state().reset();
+ this.addFiles.apply( this );
+ this.workflow.open();
+ }
+
+ return false;
+ },
+
+ addFiles: function() {
+ if ( this.files.length ) {
+ this.workflow.uploader.uploader.uploader.addFile( _.toArray( this.files ) );
+ this.files = [];
+ }
+ return this;
+ },
+
+ containerDragover: function() {
+ this.overContainer = true;
+ this.refresh();
+ },
+
+ containerDragleave: function() {
+ this.overContainer = false;
+
+ // Throttle dragleave because it's called when bouncing from some elements to others.
+ _.delay( _.bind( this.refresh, this ), 50 );
+ },
+
+ dropzoneDragover: function() {
+ this.$el.addClass( 'droppable' );
+ this.overDropzone = true;
+ _.defer( _.bind( this.refresh, this ) );
+ return false;
+ },
+
+ dropzoneDragleave: function() {
+ this.$el.removeClass( 'droppable' );
+ this.overDropzone = false;
+ this.refresh();
+ }
+ });
+
+ /**
</ins><span class="cx"> * wp.media.view.UploaderInline
</span><span class="cx"> *
</span><span class="cx"> * @constructor
</span></span></pre></div>
<a id="trunksrcwpincludesjspluploadwppluploadjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/plupload/wp-plupload.js (27342 => 27343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/plupload/wp-plupload.js 2014-03-01 14:59:53 UTC (rev 27342)
+++ trunk/src/wp-includes/js/plupload/wp-plupload.js 2014-03-01 21:33:36 UTC (rev 27343)
</span><span class="lines">@@ -149,6 +149,8 @@
</span><span class="cx"> dropzone.trigger('dropzone:leave').removeClass('drag-over');
</span><span class="cx"> }, 0 );
</span><span class="cx"> });
</span><ins>+
+ $(self).trigger( 'uploader:ready' );
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> this.uploader.init();
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media-template.php (27342 => 27343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media-template.php 2014-03-01 14:59:53 UTC (rev 27342)
+++ trunk/src/wp-includes/media-template.php 2014-03-01 21:33:36 UTC (rev 27343)
</span><span class="lines">@@ -41,6 +41,12 @@
</span><span class="cx"> </div>
</span><span class="cx"> </script>
</span><span class="cx">
</span><ins>+ <script type="text/html" id="tmpl-uploader-editor">
+ <div class="uploader-editor-content">
+ <h3><?php _e( 'Drop files to upload' ); ?></h3>
+ </div>
+ </script>
+
</ins><span class="cx"> <script type="text/html" id="tmpl-uploader-inline">
</span><span class="cx"> <# var messageClass = data.message ? 'has-upload-message' : 'no-upload-message'; #>
</span><span class="cx"> <div class="uploader-inline-content {{ messageClass }}">
</span></span></pre>
</div>
</div>
</body>
</html>