<!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>[27464] trunk/src: Limit the drag/drop upload only to newer browsers (IE10+), add a fullscreen dropzone in DFW mode, props kovshenin, see #19845</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/27464">27464</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-03-08 01:34:04 +0000 (Sat, 08 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Limit the drag/drop upload only to newer browsers (IE10+), add a fullscreen dropzone in DFW mode, 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="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media-views.js</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 (27463 => 27464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/edit.css 2014-03-08 01:25:28 UTC (rev 27463)
+++ trunk/src/wp-admin/css/edit.css 2014-03-08 01:34:04 UTC (rev 27464)
</span><span class="lines">@@ -612,6 +612,12 @@
</span><span class="cx"> text-align: center;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.wp-fullscreen-wrap .uploader-editor {
+ background: rgba( 0, 86, 132, 0.9 );
+ position: fixed;
+ z-index: 100050; /* above the editor toolbar */
+}
+
</ins><span class="cx"> .uploader-editor-content {
</span><span class="cx"> border: 1px dashed #fff;
</span><span class="cx"> position: absolute;
</span><span class="lines">@@ -619,11 +625,9 @@
</span><span class="cx"> left: 10px;
</span><span class="cx"> right: 10px;
</span><span class="cx"> bottom: 10px;
</span><del>- pointer-events: none;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #poststuff .uploader-editor-content h3 {
</span><del>- margin: -0.5em 0 0;
</del><span class="cx"> position: absolute;
</span><span class="cx"> top: 50%;
</span><span class="cx"> left: 0;
</span><span class="lines">@@ -635,7 +639,6 @@
</span><span class="cx"> color: #fff;
</span><span class="cx"> padding: 0;
</span><span class="cx"> display: none;
</span><del>- pointer-events: none;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .uploader-editor.droppable {
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (27463 => 27464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-03-08 01:25:28 UTC (rev 27463)
+++ trunk/src/wp-includes/js/media-views.js 2014-03-08 01:34:04 UTC (rev 27464)
</span><span class="lines">@@ -3423,6 +3423,13 @@
</span><span class="cx"> template: media.template( 'uploader-editor' ),
</span><span class="cx">
</span><span class="cx"> initialize: function() {
</span><ins>+ this.initialized = false;
+
+ // Bail if UA does not support drag'n'drop or File API.
+ if ( ! this.browserSupport() ) {
+ return this;
+ }
+
</ins><span class="cx"> this.$document = $(document);
</span><span class="cx"> this.dropzones = [];
</span><span class="cx"> this.files = [];
</span><span class="lines">@@ -3434,19 +3441,37 @@
</span><span class="cx"> this.$document.on( 'dragover', _.bind( this.containerDragover, this ) );
</span><span class="cx"> this.$document.on( 'dragleave', _.bind( this.containerDragleave, this ) );
</span><span class="cx">
</span><ins>+ this.initialized = true;
</ins><span class="cx"> return this;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- refresh: function() {
</del><ins>+ browserSupport: function() {
+ var supports = false, div = document.createElement('div');
+
+ supports = ( 'draggable' in div ) || ( 'ondragstart' in div && 'ondrop' in div );
+ supports = supports && !! ( window.File && window.FileList && window.FileReader );
+ return supports;
+ },
+
+ refresh: function( e ) {
</ins><span class="cx"> var dropzone_id;
</span><span class="cx"> for ( dropzone_id in this.dropzones ) {
</span><span class="cx"> // Hide the dropzones only if dragging has left the screen.
</span><span class="cx"> this.dropzones[ dropzone_id ].toggle( this.overContainer || this.overDropzone );
</span><span class="cx"> }
</span><ins>+
+ if ( ! _.isUndefined( e ) ) {
+ $( e.target ).closest( '.uploader-editor' ).toggleClass( 'droppable', this.overDropzone );
+ }
+
</ins><span class="cx"> return this;
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> render: function() {
</span><ins>+ if ( ! this.initialized ) {
+ return this;
+ }
+
</ins><span class="cx"> media.View.prototype.render.apply( this, arguments );
</span><span class="cx"> $( '.wp-editor-wrap' ).each( _.bind( this.attach, this ) );
</span><span class="cx"> return this;
</span><span class="lines">@@ -3514,16 +3539,14 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> dropzoneDragover: function( e ) {
</span><del>- $( e.target ).addClass( 'droppable' );
</del><span class="cx"> this.overDropzone = true;
</span><del>- _.defer( _.bind( this.refresh, this ) );
</del><ins>+ this.refresh( e );
</ins><span class="cx"> return false;
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> dropzoneDragleave: function( e ) {
</span><del>- $( e.target ).removeClass( 'droppable' );
</del><span class="cx"> this.overDropzone = false;
</span><del>- this.refresh();
</del><ins>+ _.delay( _.bind( this.refresh, this, e ), 50 );
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>