<!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>[26474] trunk/src/wp-admin: Widgets: highlight all drop zones (open and closed sidebars) on starting to drag a widget to indicate "droppability", fixes #26168.</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/26474">26474</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2013-11-29 17:57:05 +0000 (Fri, 29 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Widgets: highlight all drop zones (open and closed sidebars) on starting to drag a widget to indicate "droppability", fixes <a href="http://core.trac.wordpress.org/ticket/26168">#26168</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsswpadmincss">trunk/src/wp-admin/css/wp-admin.css</a></li>
<li><a href="#trunksrcwpadminjswidgetsjs">trunk/src/wp-admin/js/widgets.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsswpadmincss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/wp-admin.css (26473 => 26474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/wp-admin.css 2013-11-29 17:16:46 UTC (rev 26473)
+++ trunk/src/wp-admin/css/wp-admin.css 2013-11-29 17:57:05 UTC (rev 26474)
</span><span class="lines">@@ -10082,7 +10082,6 @@
</span><span class="cx">
</span><span class="cx"> .widget.ui-sortable-helper {
</span><span class="cx"> opacity: 0.8;
</span><del>- z-index: 2000;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .widget-placeholder {
</span><span class="lines">@@ -10293,11 +10292,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Dragging a widget over a closed sidebar */
</span><del>-#widgets-right .widgets-holder-wrap.closed.widget-hover {
</del><ins>+#widgets-right .widgets-holder-wrap.widget-hover {
</ins><span class="cx"> border-color: #777;
</span><span class="cx"> box-shadow: 0 1px 2px rgba(0,0,0,0.3);
</span><del>- opacity: 0.6;
-}
</del><ins>+}
</ins><span class="cx">
</span><span class="cx"> /* Accessibility Mode */
</span><span class="cx"> .widgets_access #widgets-left .widget .widget-top {
</span></span></pre></div>
<a id="trunksrcwpadminjswidgetsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/widgets.js (26473 => 26474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/widgets.js 2013-11-29 17:16:46 UTC (rev 26473)
+++ trunk/src/wp-admin/js/widgets.js 2013-11-29 17:57:05 UTC (rev 26474)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> distance: 2,
</span><span class="cx"> containment: 'document',
</span><span class="cx"> start: function( event, ui ) {
</span><del>- var $this = $(this),
</del><ins>+ var height, $this = $(this),
</ins><span class="cx"> $wrap = $this.parent(),
</span><span class="cx"> inside = ui.item.children('.widget-inside');
</span><span class="cx">
</span><span class="lines">@@ -126,15 +126,11 @@
</span><span class="cx"> $(this).sortable('refreshPositions');
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $wrap.hasClass('closed') ) {
- // There is a bug in UI Sortable that prevents firing of "over" when dragging a connected Draggable.
- // This won't be needed when the bug is fixed.
- $wrap.addClass('widget-hover');
- } else {
</del><ins>+ if ( ! $wrap.hasClass('closed') ) {
</ins><span class="cx"> // Lock all open sidebars min-height when starting to drag.
</span><span class="cx"> // Prevents jumping when dragging a widget from an open sidebar to a closed sidebar below.
</span><del>- $wrap.css( 'min-height', $wrap.height() + 'px' );
- $this.css( 'min-height', $this.height() - 2 + 'px' );
</del><ins>+ height = ui.item.hasClass('ui-draggable') ? $this.height() : 1 + $this.height();
+ $this.css( 'min-height', height + 'px' );
</ins><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -152,7 +148,7 @@
</span><span class="cx"> addNew = $widget.find('input.add_new').val();
</span><span class="cx"> widgetNumber = $widget.find('input.multi_number').val();
</span><span class="cx">
</span><del>- $widget.attr( 'style', '' );
</del><ins>+ $widget.attr( 'style', '' ).removeClass('ui-draggable');
</ins><span class="cx"> the_id = '';
</span><span class="cx">
</span><span class="cx"> if ( addNew ) {
</span><span class="lines">@@ -179,7 +175,7 @@
</span><span class="cx"> $sidebar = $widget.parent();
</span><span class="cx">
</span><span class="cx"> if ( $sidebar.parent().hasClass('closed') ) {
</span><del>- $sidebar.parent().removeClass('widget-hover closed jump-open');
</del><ins>+ $sidebar.parent().removeClass('closed');
</ins><span class="cx"> $children = $sidebar.children('.widget');
</span><span class="cx">
</span><span class="cx"> // Make sure the dropped widget is at the top
</span><span class="lines">@@ -200,21 +196,13 @@
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><del>- over: function() {
- var $wrap = $(this).parent();
-
- if ( $wrap.hasClass('closed') ) {
- $wrap.addClass('widget-hover');
- }
</del><ins>+ activate: function() {
+ $(this).parent().addClass( 'widget-hover' );
</ins><span class="cx"> },
</span><span class="cx">
</span><del>- out: function() {
- $(this).parent().removeClass('widget-hover');
- },
-
</del><span class="cx"> deactivate: function() {
</span><span class="cx"> // Remove all min-height added on "start"
</span><del>- $(this).css( 'min-height', '' ).parent().css( 'min-height', '' );
</del><ins>+ $(this).css( 'min-height', '' ).parent().removeClass( 'widget-hover' );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> receive: function( event, ui ) {
</span></span></pre>
</div>
</div>
</body>
</html>