Changeset 26665
- Timestamp:
- 12/05/2013 08:20:03 AM (11 years ago)
- Location:
- trunk/src/wp-content/themes/twentyfourteen
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-content/themes/twentyfourteen/functions.php
r26657 r26665 256 256 257 257 if ( is_front_page() && 'slider' == get_theme_mod( 'featured_content_layout' ) ) { 258 wp_enqueue_script( 'twentyfourteen-slider', get_template_directory_uri() . '/js/slider.js', array( 'jquery' ), '20131 109', true );258 wp_enqueue_script( 'twentyfourteen-slider', get_template_directory_uri() . '/js/slider.js', array( 'jquery' ), '20131205', true ); 259 259 wp_localize_script( 'twentyfourteen-slider', 'featuredSliderDefaults', array( 260 260 'prevText' => __( 'Previous', 'twentyfourteen' ), -
trunk/src/wp-content/themes/twentyfourteen/js/slider.js
r26606 r26665 40 40 slider.isRtl = $( 'body' ).hasClass( 'rtl' ); 41 41 slider.args = {}; 42 slider.limit = 0; 42 43 // TOUCH 43 44 slider.transitions = ( function() { … … 77 78 target = false; 78 79 if ( ! slider.animating && ( keycode === 39 || keycode === 37 ) ) { 79 if ( keycode === 39){80 if ( keycode === 39 ) { 80 81 target = slider.getTarget( 'next' ); 81 } else if ( keycode === 37) {82 } else if ( keycode === 37 ) { 82 83 target = slider.getTarget( 'prev' ); 83 84 } … … 244 245 localY = e.touches[0].pageY; 245 246 246 offset = ( slider.animatingTo === slider.last ) ? 0 : 247 ( slider.currentSlide === slider.last ) ? slider.limit : ( slider.currentSlide + slider.cloneOffset ) * cwidth; 247 offset = ( slider.currentSlide + slider.cloneOffset ) * cwidth; 248 if ( slider.animatingTo === slider.last && slider.direction !== 'next' ) { 249 offset = 0; 250 } 251 248 252 startX = localX; 249 253 startY = localY; … … 262 266 scrolling = Math.abs( dx ) < Math.abs( localY - startY ); 263 267 264 var fxms = 500; 265 266 if ( ! scrolling || Number( new Date() ) - startT > fxms ) { 268 if ( ! scrolling ) { 267 269 e.preventDefault(); 268 270 if ( slider.transitions ) { … … 299 301 cwidth = slider.w; 300 302 startT = Number( new Date() ); 301 offset = ( slider.animatingTo === slider.last ) ? 0 : ( slider.currentSlide === slider.last ) ? slider.limit : ( slider.currentSlide + slider.cloneOffset ) * cwidth; 303 offset = ( slider.currentSlide + slider.cloneOffset ) * cwidth; 304 if ( slider.animatingTo === slider.last && slider.direction !== 'next' ) { 305 offset = 0; 306 } 302 307 } 303 308 }
Note: See TracChangeset
for help on using the changeset viewer.