<!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>[46824] trunk/src/wp-content/themes/twentytwenty: Twenty Twenty: Replace Smooth Scroll JS implementation with `scroll-behavior` CSS property.</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 { white-space: pre-line; 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/46824">46824</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/46824","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-12-07 11:03:09 +0000 (Sat, 07 Dec 2019)</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'>Twenty Twenty: Replace Smooth Scroll JS implementation with `scroll-behavior` CSS property.
The JS implementation had multiple issues and did not work as expected.
This change includes an accessibility enhancement by using `prefers-reduced-motion: reduce` media query property for users that don't want motion effects. For further explanation on this media query, see MDN documentation: https://developer.mozilla.org/en-US/docs/Web/CSS/scroll-behavior#Accessibility_concerns
Props audrasjb, melchoyce, joostdevalk, Anlino, mauteri, sergiomdgomes, littlebigthing, williampatton, netweb, andraganescu, joyously, acosmin, mukesh27, hareesh-pillai.
Fixes <a href="https://core.trac.wordpress.org/ticket/48763">#48763</a>, <a href="https://core.trac.wordpress.org/ticket/48551">#48551</a>, <a href="https://core.trac.wordpress.org/ticket/48866">#48866</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentytwentyassetsjsindexjs">trunk/src/wp-content/themes/twentytwenty/assets/js/index.js</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwentystylertlcss">trunk/src/wp-content/themes/twentytwenty/style-rtl.css</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwentystylecss">trunk/src/wp-content/themes/twentytwenty/style.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentytwentyassetsjsindexjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/assets/js/index.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/assets/js/index.js 2019-12-06 22:41:26 UTC (rev 46823)
+++ trunk/src/wp-content/themes/twentytwenty/assets/js/index.js 2019-12-07 11:03:09 UTC (rev 46824)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -323,98 +323,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }; // twentytwenty.instrinsicRatioVideos
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* -----------------------------------------------------------------------------------------------
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- Smooth Scroll
---------------------------------------------------------------------------------------------------- */
-
-twentytwenty.smoothScroll = {
-
- init: function() {
- // Scroll to anchor
- this.scrollToAnchor();
-
- // Scroll to element
- this.scrollToElement();
- },
-
- // Scroll to anchor
- scrollToAnchor: function() {
- var anchorElements = document.querySelectorAll( 'a[href*="#"]' );
- var anchorElementsList = Array.prototype.slice.call( anchorElements );
- anchorElementsList.filter( function( element ) {
- if ( element.href === '#' || element.href === '#0' || element.id === 'cancel-comment-reply-link' || element.classList.contains( 'do-not-scroll' ) || element.classList.contains( 'skip-link' ) ) {
- return false;
- }
- return true;
- } ).forEach( function( element ) {
- element.addEventListener( 'click', function( event ) {
- var target, scrollOffset, originalOffset, adminBar, scrollSpeed, additionalOffset;
-
- // On-page links
- if ( window.location.hostname === event.target.hostname ) {
- // Figure out element to scroll to
- target = window.location.hash !== '' && document.querySelector( window.location.hash );
- target = target ? target : event.target.hash !== '' && document.querySelector( event.target.hash );
-
- // Does a scroll target exist?
- if ( target ) {
- // Only prevent default if animation is actually gonna happen
- event.preventDefault();
-
- // Get options
- additionalOffset = event.target.dataset.additionalOffset;
- scrollSpeed = event.target.dataset.scrollSpeed ? event.target.dataset.scrollSpeed : 500;
-
- // Determine offset
-
- adminBar = document.querySelector( '#wpadminbar' );
-
- originalOffset = target.getBoundingClientRect().top + window.pageYOffset;
- scrollOffset = additionalOffset ? originalOffset + additionalOffset : originalOffset;
-
- if ( adminBar && event.target.className === 'to-the-top' ) {
- scrollOffset = scrollOffset - adminBar.getBoundingClientRect().height;
- }
-
- twentytwentyScrollTo( scrollOffset, null, scrollSpeed );
-
- window.location.hash = event.target.hash.slice( 1 );
- }
- }
- } );
- } );
- },
-
- // Scroll to element
- scrollToElement: function() {
- var scrollToElement = document.querySelector( '*[data-scroll-to]' );
-
- if ( scrollToElement ) {
- scrollToElement.addEventListener( 'click', function( event ) {
- var originalOffset, additionalOffset, scrollOffset, scrollSpeed,
- // Figure out element to scroll to
- target = event.target.dataset.twentytwentyScrollTo;
-
- // Make sure said element exists
- if ( target ) {
- event.preventDefault();
-
- // Get options
- additionalOffset = event.target.dataset.additionalOffset;
- scrollSpeed = event.target.dataset.scrollSpeed ? event.target.dataset.scrollSpeed : 500;
-
- // Determine offset
- originalOffset = target.getBoundingClientRect().top + window.pageYOffset;
- scrollOffset = additionalOffset ? originalOffset + additionalOffset : originalOffset;
-
- twentytwentyScrollTo( scrollOffset, null, scrollSpeed );
- }
- } );
- }
- }
-
-}; // twentytwenty.smoothScroll
-
-/* -----------------------------------------------------------------------------------------------
</del><span class="cx" style="display: block; padding: 0 10px"> Modal Menu
</span><span class="cx" style="display: block; padding: 0 10px"> --------------------------------------------------------------------------------------------------- */
</span><span class="cx" style="display: block; padding: 0 10px"> twentytwenty.modalMenu = {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -745,7 +653,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> twentytwenty.toggles.init(); // Handle toggles
</span><span class="cx" style="display: block; padding: 0 10px"> twentytwenty.coverModals.init(); // Handle cover modals
</span><span class="cx" style="display: block; padding: 0 10px"> twentytwenty.intrinsicRatioVideos.init(); // Retain aspect ratio of videos on window resize
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- twentytwenty.smoothScroll.init(); // Smooth scroll to anchor link or a specific element
</del><span class="cx" style="display: block; padding: 0 10px"> twentytwenty.modalMenu.init(); // Modal Menu
</span><span class="cx" style="display: block; padding: 0 10px"> twentytwenty.primaryMenu.init(); // Primary Menu
</span><span class="cx" style="display: block; padding: 0 10px"> twentytwenty.touchEnabled.init(); // Add class to body if device is touch-enabled
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -891,49 +798,3 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return parents;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-// twentytwentyEaseInOutQuad functions http://goo.gl/5HLl8
-function twentytwentyEaseInOutQuad( t, b, c, d ) {
- t /= d / 2;
- if ( t < 1 ) {
- return ( ( ( c / 2 ) * t ) * t ) + b;
- }
- t--;
- return ( ( -c / 2 ) * ( ( t * ( t - 2 ) ) - 1 ) ) + b;
-}
-
-function twentytwentyScrollTo( to, callback, duration ) {
- var start, change, increment, currentTime;
-
- function move( amount ) {
- document.documentElement.scrollTop = amount;
- document.body.parentNode.scrollTop = amount;
- document.body.scrollTop = amount;
- }
-
- start = document.documentElement.scrollTop || document.body.parentNode.scrollTop || document.body.scrollTop;
- change = to - start;
- increment = 20;
- currentTime = 0;
-
- duration = ( typeof ( duration ) === 'undefined' ) ? 500 : duration;
-
- function animateScroll() {
- var val;
-
- // increment the time
- currentTime += increment;
- // find the value with the quadratic in-out twentytwentyEaseInOutQuad function
- val = twentytwentyEaseInOutQuad( currentTime, start, change, duration );
- // move the document.body
- move( val );
- // do the animation unless its over
- if ( currentTime < duration ) {
- window.requestAnimationFrame( animateScroll );
- } else if ( callback && typeof ( callback ) === 'function' ) {
- // the animation is done so lets callback
- callback();
- }
- }
- animateScroll();
-}
</del></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwentystylertlcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/style-rtl.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/style-rtl.css 2019-12-06 22:41:26 UTC (rev 46823)
+++ trunk/src/wp-content/themes/twentytwenty/style-rtl.css 2019-12-07 11:03:09 UTC (rev 46824)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,8 +115,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> html {
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 62.5%; /* 1rem = 10px */
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ scroll-behavior: smooth;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+@media (prefers-reduced-motion: reduce) {
+ html {
+ scroll-behavior: auto;
+ }
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> body {
</span><span class="cx" style="display: block; padding: 0 10px"> background: #f5efe0;
</span><span class="cx" style="display: block; padding: 0 10px"> box-sizing: border-box;
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwentystylecss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/style.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/style.css 2019-12-06 22:41:26 UTC (rev 46823)
+++ trunk/src/wp-content/themes/twentytwenty/style.css 2019-12-07 11:03:09 UTC (rev 46824)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,8 +115,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> html {
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 62.5%; /* 1rem = 10px */
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ scroll-behavior: smooth;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+@media (prefers-reduced-motion: reduce) {
+ html {
+ scroll-behavior: auto;
+ }
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> body {
</span><span class="cx" style="display: block; padding: 0 10px"> background: #f5efe0;
</span><span class="cx" style="display: block; padding: 0 10px"> box-sizing: border-box;
</span></span></pre>
</div>
</div>
</body>
</html>