<!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>[26084] trunk/src/wp-content/themes/twentyfourteen/js: Twenty Fourteen: changes to JavaScript files to pass `jshint`, props jorbin.</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/26084">26084</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2013-11-11 17:26:24 +0000 (Mon, 11 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Fourteen: changes to JavaScript files to pass `jshint`, props jorbin. Fixes <a href="http://core.trac.wordpress.org/ticket/25908">#25908</a> <a href="http://core.trac.wordpress.org/ticket/25909">#25909</a> <a href="http://core.trac.wordpress.org/ticket/25910">#25910</a>.
* Add global variable flags to top of JS files.
* Group variable declarations correctly.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyfourteenjsfeaturedcontentadminjs">trunk/src/wp-content/themes/twentyfourteen/js/featured-content-admin.js</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenjsfunctionsjs">trunk/src/wp-content/themes/twentyfourteen/js/functions.js</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="trunksrcwpcontentthemestwentyfourteenjsfeaturedcontentadminjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/js/featured-content-admin.js (26083 => 26084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/js/featured-content-admin.js 2013-11-11 15:50:49 UTC (rev 26083)
+++ trunk/src/wp-content/themes/twentyfourteen/js/featured-content-admin.js 2013-11-11 17:26:24 UTC (rev 26084)
</span><span class="lines">@@ -1,3 +1,4 @@
</span><ins>+/* global ajaxurl:true */
</ins><span class="cx"> jQuery( function( $ ) {
</span><span class="cx"> $( '#customize-control-featured-content-tag-name input' ).suggest( ajaxurl + '?action=ajax-tag-search&tax=post_tag', { delay: 500, minchars: 2 } );
</span><span class="cx"> } );
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenjsfunctionsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/js/functions.js (26083 => 26084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/js/functions.js 2013-11-11 15:50:49 UTC (rev 26083)
+++ trunk/src/wp-content/themes/twentyfourteen/js/functions.js 2013-11-11 17:26:24 UTC (rev 26084)
</span><span class="lines">@@ -66,15 +66,16 @@
</span><span class="cx"> * image and we are not on mobile.
</span><span class="cx"> */
</span><span class="cx"> if ( _window.width() > 781 ) {
</span><del>- var mastheadHeight = $( '#masthead' ).height();
</del><ins>+ var mastheadHeight = $( '#masthead' ).height(),
+ toolbarOffset, mastheadOffset;
</ins><span class="cx">
</span><span class="cx"> if ( mastheadHeight > 48 ) {
</span><span class="cx"> body.removeClass( 'masthead-fixed' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( body.is( '.header-image' ) ) {
</span><del>- var toolbarOffset = body.is( '.admin-bar' ) ? $( '#wpadminbar' ).height() : 0,
- mastheadOffset = $( '#masthead' ).offset().top - toolbarOffset;
</del><ins>+ toolbarOffset = body.is( '.admin-bar' ) ? $( '#wpadminbar' ).height() : 0;
+ mastheadOffset = $( '#masthead' ).offset().top - toolbarOffset;
</ins><span class="cx">
</span><span class="cx"> _window.on( 'scroll.twentyfourteen', function() {
</span><span class="cx"> if ( ( window.scrollY > mastheadOffset ) && ( mastheadHeight < 49 ) ) {
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenjssliderjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/js/slider.js (26083 => 26084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/js/slider.js 2013-11-11 15:50:49 UTC (rev 26083)
+++ trunk/src/wp-content/themes/twentyfourteen/js/slider.js 2013-11-11 17:26:24 UTC (rev 26084)
</span><span class="lines">@@ -1,3 +1,4 @@
</span><ins>+/* global DocumentTouch:true,setImmediate:true,featuredSliderDefaults:true,MSGesture:true */
</ins><span class="cx"> /*
</span><span class="cx"> * Twenty Fourteen Featured Content Slider
</span><span class="cx"> *
</span><span class="lines">@@ -8,19 +9,20 @@
</span><span class="cx"> ( function( $ ) {
</span><span class="cx"> // FeaturedSlider: object instance.
</span><span class="cx"> $.featuredslider = function( el, options ) {
</span><del>- var slider = $( el );
-
- // Make variables public.
- slider.vars = $.extend( {}, $.featuredslider.defaults, options );
-
- var namespace = slider.vars.namespace,
</del><ins>+ var slider = $( el ),
</ins><span class="cx"> msGesture = window.navigator && window.navigator.msPointerEnabled && window.MSGesture,
</span><span class="cx"> touch = ( ( 'ontouchstart' in window ) || msGesture || window.DocumentTouch && document instanceof DocumentTouch ), // MSFT specific.
</span><span class="cx"> eventType = 'click touchend MSPointerUp',
</span><span class="cx"> watchedEvent = '',
</span><span class="cx"> watchedEventClearTimer,
</span><del>- methods = {};
</del><ins>+ methods = {},
+ namespace;
</ins><span class="cx">
</span><ins>+ // Make variables public.
+ slider.vars = $.extend( {}, $.featuredslider.defaults, options );
+
+ namespace = slider.vars.namespace,
+
</ins><span class="cx"> // Store a reference to the slider object.
</span><span class="cx"> $.data( el, 'featuredslider', slider );
</span><span class="cx">
</span><span class="lines">@@ -40,8 +42,10 @@
</span><span class="cx"> // TOUCH
</span><span class="cx"> slider.transitions = ( function() {
</span><span class="cx"> var obj = document.createElement( 'div' ),
</span><del>- props = ['perspectiveProperty', 'WebkitPerspective', 'MozPerspective', 'OPerspective', 'msPerspective'];
- for ( var i in props ) {
</del><ins>+ props = ['perspectiveProperty', 'WebkitPerspective', 'MozPerspective', 'OPerspective', 'msPerspective'],
+ i;
+
+ for ( i in props ) {
</ins><span class="cx"> if ( obj.style[ props[i] ] !== undefined ) {
</span><span class="cx"> slider.pfx = props[i].replace( 'Perspective', '' ).toLowerCase();
</span><span class="cx"> slider.prop = '-' + slider.pfx + '-transform';
</span><span class="lines">@@ -69,9 +73,15 @@
</span><span class="cx"> // KEYBOARD
</span><span class="cx"> if ( $( slider.containerSelector ).length === 1 ) {
</span><span class="cx"> $( document ).bind( 'keyup', function( event ) {
</span><del>- var keycode = event.keyCode;
</del><ins>+ var keycode = event.keyCode,
+ target = false;
</ins><span class="cx"> if ( ! slider.animating && ( keycode === 39 || keycode === 37 ) ) {
</span><del>- var target = ( keycode === 39 ) ? slider.getTarget( 'next' ) : ( keycode === 37 ) ? slider.getTarget( 'prev' ) : false;
</del><ins>+ if (keycode === 39){
+ target = slider.getTarget( 'next' );
+ } else if (keycode === 37) {
+ target = slider.getTarget( 'prev' );
+ }
+
</ins><span class="cx"> slider.featureAnimate( target );
</span><span class="cx"> }
</span><span class="cx"> } );
</span><span class="lines">@@ -95,12 +105,13 @@
</span><span class="cx"> var type = 'control-paging',
</span><span class="cx"> j = 1,
</span><span class="cx"> item,
</span><del>- slide;
</del><ins>+ slide,
+ i;
</ins><span class="cx">
</span><span class="cx"> slider.controlNavScaffold = $( '<ol class="' + namespace + 'control-nav ' + namespace + type + '"></ol>' );
</span><span class="cx">
</span><span class="cx"> if ( slider.pagingCount > 1 ) {
</span><del>- for ( var i = 0; i < slider.pagingCount; i++ ) {
</del><ins>+ for ( i = 0; i < slider.pagingCount; i++ ) {
</ins><span class="cx"> slide = slider.slides.eq( i );
</span><span class="cx"> item = '<a>' + j + '</a>';
</span><span class="cx"> slider.controlNavScaffold.append( '<li>' + item + '</li>' );
</span><span class="lines">@@ -293,13 +304,15 @@
</span><span class="cx">
</span><span class="cx"> function onMSGestureChange( e ) {
</span><span class="cx"> e.stopPropagation();
</span><del>- var slider = e.target._slider;
</del><ins>+ var slider = e.target._slider,
+ transX,
+ transY;
</ins><span class="cx"> if ( ! slider ) {
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var transX = -e.translationX,
- transY = -e.translationY;
</del><ins>+ transX = -e.translationX,
+ transY = -e.translationY;
</ins><span class="cx">
</span><span class="cx"> // Accumulate translations.
</span><span class="cx"> accDx = accDx + transX;
</span><span class="lines">@@ -324,14 +337,16 @@
</span><span class="cx">
</span><span class="cx"> function onMSGestureEnd( e ) {
</span><span class="cx"> e.stopPropagation();
</span><del>- var slider = e.target._slider;
</del><ins>+ var slider = e.target._slider,
+ updateDx,
+ target;
</ins><span class="cx"> if ( ! slider ) {
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( slider.animatingTo === slider.currentSlide && ! scrolling && dx !== null ) {
</span><del>- var updateDx = dx,
- target = ( updateDx > 0 ) ? slider.getTarget( 'next' ) : slider.getTarget( 'prev' );
</del><ins>+ updateDx = dx,
+ target = ( updateDx > 0 ) ? slider.getTarget( 'next' ) : slider.getTarget( 'prev' );
</ins><span class="cx">
</span><span class="cx"> slider.featureAnimate( target );
</span><span class="cx"> }
</span><span class="lines">@@ -440,8 +455,7 @@
</span><span class="cx">
</span><span class="cx"> slider.setProps = function( pos, special, dur ) {
</span><span class="cx"> var target = ( function() {
</span><del>- var posCheck = ( pos ) ? pos : slider.itemW * slider.animatingTo,
- posCalc = ( function() {
</del><ins>+ var posCalc = ( function() {
</ins><span class="cx"> switch ( special ) {
</span><span class="cx"> case 'setTotal': return ( slider.currentSlide + slider.cloneOffset ) * pos;
</span><span class="cx"> case 'setTouch': return pos;
</span></span></pre>
</div>
</div>
</body>
</html>