<!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>[33030] trunk/src/wp-admin/js: Customizer: Make reordering menu items via drag and drop easier.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/33030">33030</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/33030","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-07-01 16:43:02 +0000 (Wed, 01 Jul 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Customizer: Make reordering menu items via drag and drop easier.
Introduce `wpNavMenu.options.targetTolerance` to define a tolerance when dragging items where no margins between the sortable items exists.
props adamsilverstein.
fixes <a href="https://core.trac.wordpress.org/ticket/32821">#32821</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjscustomizenavmenusjs">trunk/src/wp-admin/js/customize-nav-menus.js</a></li>
<li><a href="#trunksrcwpadminjsnavmenujs">trunk/src/wp-admin/js/nav-menu.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjscustomizenavmenusjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/customize-nav-menus.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/customize-nav-menus.js 2015-07-01 16:30:34 UTC (rev 33029)
+++ trunk/src/wp-admin/js/customize-nav-menus.js 2015-07-01 16:43:02 UTC (rev 33030)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,6 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wpNavMenu.originalInit = wpNavMenu.init;
</span><span class="cx" style="display: block; padding: 0 10px"> wpNavMenu.options.menuItemDepthPerLevel = 20;
</span><span class="cx" style="display: block; padding: 0 10px"> wpNavMenu.options.sortableItems = '> .customize-control-nav_menu_item';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wpNavMenu.options.targetTolerance = 10;
</ins><span class="cx" style="display: block; padding: 0 10px"> wpNavMenu.init = function() {
</span><span class="cx" style="display: block; padding: 0 10px"> this.jQueryExtensions();
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span></span></pre></div>
<a id="trunksrcwpadminjsnavmenujs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/nav-menu.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/nav-menu.js 2015-07-01 16:30:34 UTC (rev 33029)
+++ trunk/src/wp-admin/js/nav-menu.js 2015-07-01 16:43:02 UTC (rev 33030)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,8 +20,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> options : {
</span><span class="cx" style="display: block; padding: 0 10px"> menuItemDepthPerLevel : 30, // Do not use directly. Use depthToPx and pxToDepth instead.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- globalMaxDepth : 11,
- sortableItems: '> *'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ globalMaxDepth: 11,
+ sortableItems: '> *',
+ targetTolerance: 0
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> menuList : undefined, // Set in init.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -438,7 +439,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> totalMenuItems = $('#menu-to-edit li').length,
</span><span class="cx" style="display: block; padding: 0 10px"> hasSameDepthSibling = menuItem.nextAll( '.menu-item-depth-' + depth ).length;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- menuItem.find( '.field-move' ).toggle( totalMenuItems > 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ menuItem.find( '.field-move' ).toggle( totalMenuItems > 1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Where can they move this menu item?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 !== position ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -721,11 +722,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var offset = ui.helper.offset(),
</span><span class="cx" style="display: block; padding: 0 10px"> edge = api.isRTL ? offset.left + ui.helper.width() : offset.left,
</span><span class="cx" style="display: block; padding: 0 10px"> depth = api.negateIfRTL * api.pxToDepth( edge - menuEdge );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Check and correct if depth is not within range.
</span><span class="cx" style="display: block; padding: 0 10px"> // Also, if the dragged element is dragged upwards over
</span><span class="cx" style="display: block; padding: 0 10px"> // an item, shift the placeholder to a child position.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( depth > maxDepth || offset.top < prevBottom ) depth = maxDepth;
- else if ( depth < minDepth ) depth = minDepth;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( depth > maxDepth || offset.top < ( prevBottom - api.options.targetTolerance ) ) {
+ depth = maxDepth;
+ } else if ( depth < minDepth ) {
+ depth = minDepth;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if( depth != currentDepth )
</span><span class="cx" style="display: block; padding: 0 10px"> updateCurrentDepth(ui, depth);
</span></span></pre>
</div>
</div>
</body>
</html>