<!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>[27901] trunk/src: Drag and drop files on the editor to upload: add new argument to wp_editor() to enable, fixes #27465</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/27901">27901</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-04-02 02:41:24 +0000 (Wed, 02 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Drag and drop files on the editor to upload: add new argument to wp_editor() to enable, fixes <a href="http://core.trac.wordpress.org/ticket/27465">#27465</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmineditformadvancedphp">trunk/src/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunksrcwpincludesclasswpeditorphp">trunk/src/wp-includes/class-wp-editor.php</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media-views.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswordpresspluginjs">trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/edit-form-advanced.php (27900 => 27901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/edit-form-advanced.php 2014-04-02 02:26:12 UTC (rev 27900)
+++ trunk/src/wp-admin/edit-form-advanced.php 2014-04-02 02:41:24 UTC (rev 27901)
</span><span class="lines">@@ -479,6 +479,7 @@
</span><span class="cx">
</span><span class="cx"> <?php wp_editor( $post->post_content, 'content', array(
</span><span class="cx"> 'dfw' => true,
</span><ins>+ 'drag_drop_upload' => true,
</ins><span class="cx"> 'tabfocus_elements' => 'insert-media-button,save-post',
</span><span class="cx"> 'editor_height' => 360,
</span><span class="cx"> 'tinymce' => array(
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp-editor.php (27900 => 27901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp-editor.php 2014-04-02 02:26:12 UTC (rev 27900)
+++ trunk/src/wp-includes/class-wp-editor.php 2014-04-02 02:41:24 UTC (rev 27901)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> private static $has_quicktags = false;
</span><span class="cx"> private static $has_medialib = false;
</span><span class="cx"> private static $editor_buttons_css = true;
</span><ins>+ private static $drag_drop_upload = false;
</ins><span class="cx">
</span><span class="cx"> private function __construct() {}
</span><span class="cx">
</span><span class="lines">@@ -38,6 +39,8 @@
</span><span class="cx"> * @type bool $media_buttons Whether to show the Add Media/other media buttons.
</span><span class="cx"> * @type string $default_editor When both TinyMCE and Quicktags are used, set which
</span><span class="cx"> * editor is shown on page load. Default empty.
</span><ins>+ * @type bool $drag_drop_upload Whether to enable drag & drop on the editor uploading. Default false.
+ * Requires the media modal.
</ins><span class="cx"> * @type string $textarea_name Give the textarea a unique name here. Square brackets
</span><span class="cx"> * can be used here. Default $editor_id.
</span><span class="cx"> * @type int $textarea_rows Number rows in the editor textarea. Default 20.
</span><span class="lines">@@ -63,6 +66,7 @@
</span><span class="cx"> 'wpautop' => true,
</span><span class="cx"> 'media_buttons' => true,
</span><span class="cx"> 'default_editor' => '',
</span><ins>+ 'drag_drop_upload' => false,
</ins><span class="cx"> 'textarea_name' => $editor_id,
</span><span class="cx"> 'textarea_rows' => 20,
</span><span class="cx"> 'tabindex' => '',
</span><span class="lines">@@ -124,6 +128,10 @@
</span><span class="cx"> $switch_class = 'html-active';
</span><span class="cx"> $toolbar = $buttons = $autocomplete = '';
</span><span class="cx">
</span><ins>+ if ( $set['drag_drop_upload'] ) {
+ self::$drag_drop_upload = true;
+ }
+
</ins><span class="cx"> if ( ! empty( $set['editor_height'] ) )
</span><span class="cx"> $height = ' style="height: ' . $set['editor_height'] . 'px"';
</span><span class="cx"> else
</span><span class="lines">@@ -980,6 +988,13 @@
</span><span class="cx"> tinyMCEPreInit = {
</span><span class="cx"> baseURL: "<?php echo self::$baseurl; ?>",
</span><span class="cx"> suffix: "<?php echo $suffix; ?>",
</span><ins>+ <?php
+
+ if ( self::$drag_drop_upload ) {
+ echo 'dragDropUpload: true,';
+ }
+
+ ?>
</ins><span class="cx"> mceInit: <?php echo $mceInit; ?>,
</span><span class="cx"> qtInit: <?php echo $qtInit; ?>,
</span><span class="cx"> ref: <?php echo self::_parse_init( $ref ); ?>,
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (27900 => 27901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-04-02 02:26:12 UTC (rev 27900)
+++ trunk/src/wp-includes/js/media-views.js 2014-04-02 02:41:24 UTC (rev 27901)
</span><span class="lines">@@ -3131,8 +3131,8 @@
</span><span class="cx">
</span><span class="cx"> this.initialized = false;
</span><span class="cx">
</span><del>- // Bail if UA does not support drag'n'drop or File API.
- if ( ! this.browserSupport() ) {
</del><ins>+ // Bail if not enabled or UA does not support drag'n'drop or File API.
+ if ( ! window.tinyMCEPreInit || ! window.tinyMCEPreInit.dragDropUpload || ! this.browserSupport() ) {
</ins><span class="cx"> return this;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginswordpresspluginjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js (27900 => 27901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2014-04-02 02:26:12 UTC (rev 27900)
+++ trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2014-04-02 02:41:24 UTC (rev 27901)
</span><span class="lines">@@ -311,12 +311,14 @@
</span><span class="cx"> window.jQuery( document ).triggerHandler( 'tinymce-editor-init', [editor] );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- dom.bind( doc, 'dragstart dragend dragover drop', function( event ) {
- if ( typeof window.jQuery !== 'undefined' ) {
- // Trigger the jQuery handlers.
- window.jQuery( document ).triggerHandler( event.type );
- }
- });
</del><ins>+ if ( window.tinyMCEPreInit && window.tinyMCEPreInit.dragDropUpload ) {
+ dom.bind( doc, 'dragstart dragend dragover drop', function( event ) {
+ if ( typeof window.jQuery !== 'undefined' ) {
+ // Trigger the jQuery handlers.
+ window.jQuery( document ).triggerHandler( event.type );
+ }
+ });
+ }
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> // Word count
</span></span></pre>
</div>
</div>
</body>
</html>