<!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>[26665] trunk/src/wp-content/themes/twentyfourteen: Twenty Fourteen: fix two usability issues with touch events on mobile devices with the Featured Content slider:</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/26665">26665</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2013-12-05 08:20:03 +0000 (Thu, 05 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Fourteen: fix two usability issues with touch events on mobile devices with the Featured Content slider:
* Try to avoid the slight delay when swiping from one slide to the next.
* Fix bug where second to last slide was animating like it was the last.
Fixes <a href="http://core.trac.wordpress.org/ticket/26191">#26191</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyfourteenfunctionsphp">trunk/src/wp-content/themes/twentyfourteen/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenjssliderjs">trunk/src/wp-content/themes/twentyfourteen/js/slider.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentyfourteenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/functions.php (26664 => 26665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/functions.php 2013-12-05 06:37:20 UTC (rev 26664)
+++ trunk/src/wp-content/themes/twentyfourteen/functions.php 2013-12-05 08:20:03 UTC (rev 26665)
</span><span class="lines">@@ -255,7 +255,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( is_front_page() && 'slider' == get_theme_mod( 'featured_content_layout' ) ) {
</span><del>- wp_enqueue_script( 'twentyfourteen-slider', get_template_directory_uri() . '/js/slider.js', array( 'jquery' ), '20131109', true );
</del><ins>+ wp_enqueue_script( 'twentyfourteen-slider', get_template_directory_uri() . '/js/slider.js', array( 'jquery' ), '20131205', true );
</ins><span class="cx"> wp_localize_script( 'twentyfourteen-slider', 'featuredSliderDefaults', array(
</span><span class="cx"> 'prevText' => __( 'Previous', 'twentyfourteen' ),
</span><span class="cx"> 'nextText' => __( 'Next', 'twentyfourteen' )
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenjssliderjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/js/slider.js (26664 => 26665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/js/slider.js 2013-12-05 06:37:20 UTC (rev 26664)
+++ trunk/src/wp-content/themes/twentyfourteen/js/slider.js 2013-12-05 08:20:03 UTC (rev 26665)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> slider.prop = 'marginLeft';
</span><span class="cx"> slider.isRtl = $( 'body' ).hasClass( 'rtl' );
</span><span class="cx"> slider.args = {};
</span><ins>+ slider.limit = 0;
</ins><span class="cx"> // TOUCH
</span><span class="cx"> slider.transitions = ( function() {
</span><span class="cx"> var obj = document.createElement( 'div' ),
</span><span class="lines">@@ -76,9 +77,9 @@
</span><span class="cx"> var keycode = event.keyCode,
</span><span class="cx"> target = false;
</span><span class="cx"> if ( ! slider.animating && ( keycode === 39 || keycode === 37 ) ) {
</span><del>- if (keycode === 39){
</del><ins>+ if ( keycode === 39 ) {
</ins><span class="cx"> target = slider.getTarget( 'next' );
</span><del>- } else if (keycode === 37) {
</del><ins>+ } else if ( keycode === 37 ) {
</ins><span class="cx"> target = slider.getTarget( 'prev' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -243,8 +244,11 @@
</span><span class="cx"> localX = e.touches[0].pageX;
</span><span class="cx"> localY = e.touches[0].pageY;
</span><span class="cx">
</span><del>- offset = ( slider.animatingTo === slider.last ) ? 0 :
- ( slider.currentSlide === slider.last ) ? slider.limit : ( slider.currentSlide + slider.cloneOffset ) * cwidth;
</del><ins>+ offset = ( slider.currentSlide + slider.cloneOffset ) * cwidth;
+ if ( slider.animatingTo === slider.last && slider.direction !== 'next' ) {
+ offset = 0;
+ }
+
</ins><span class="cx"> startX = localX;
</span><span class="cx"> startY = localY;
</span><span class="cx">
</span><span class="lines">@@ -261,9 +265,7 @@
</span><span class="cx"> dx = startX - localX;
</span><span class="cx"> scrolling = Math.abs( dx ) < Math.abs( localY - startY );
</span><span class="cx">
</span><del>- var fxms = 500;
-
- if ( ! scrolling || Number( new Date() ) - startT > fxms ) {
</del><ins>+ if ( ! scrolling ) {
</ins><span class="cx"> e.preventDefault();
</span><span class="cx"> if ( slider.transitions ) {
</span><span class="cx"> slider.setProps( offset + dx, 'setTouch' );
</span><span class="lines">@@ -298,7 +300,10 @@
</span><span class="cx"> accDx = 0;
</span><span class="cx"> cwidth = slider.w;
</span><span class="cx"> startT = Number( new Date() );
</span><del>- offset = ( slider.animatingTo === slider.last ) ? 0 : ( slider.currentSlide === slider.last ) ? slider.limit : ( slider.currentSlide + slider.cloneOffset ) * cwidth;
</del><ins>+ offset = ( slider.currentSlide + slider.cloneOffset ) * cwidth;
+ if ( slider.animatingTo === slider.last && slider.direction !== 'next' ) {
+ offset = 0;
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>