@ -7,7 +7,7 @@
/* global _gaq: true */
/* global _gaq: true */
! function ( ) {
! ( function ( ) {
'use strict' ;
'use strict' ;
var noop = function ( ) { } ;
var noop = function ( ) { } ;
@ -87,18 +87,16 @@
var getTarget = function ( e ) {
var getTarget = function ( e ) {
var target = findTarget ( e . target ) ;
var target = findTarget ( e . target ) ;
if (
if ( ! target ||
! target
e . which > 1 ||
|| e . which > 1
e . metaKey ||
|| e . metaKey
e . ctrlKey ||
|| e . ctrlKey
isScrolling ||
|| isScrolling
location . protocol !== target . protocol ||
|| location . protocol !== target . protocol
location . host !== target . host ||
|| location . host !== target . host
! target . hash && /#/ . test ( target . href ) ||
|| ! target . hash && /#/ . test ( target . href )
target . hash && target . href . replace ( target . hash , '' ) === location . href . replace ( location . hash , '' ) ||
|| target . hash && target . href . replace ( target . hash , '' ) === location . href . replace ( location . hash , '' )
target . getAttribute ( 'data-ignore' ) === 'push' ) { return ; }
|| target . getAttribute ( 'data-ignore' ) === 'push'
) { return ; }
return target ;
return target ;
} ;
} ;
@ -158,7 +156,7 @@
}
}
if ( direction === 'back' && ! transitionFromObj . id ) {
if ( direction === 'back' && ! transitionFromObj . id ) {
return PUSH . id = id ;
return ( PUSH . id = id ) ;
}
}
transition = direction === 'back' ? transitionMap [ transitionFromObj . transition ] : transitionFromObj . transition ;
transition = direction === 'back' ? transitionMap [ transitionFromObj . transition ] : transitionFromObj . transition ;
@ -477,4 +475,4 @@
window . addEventListener ( 'popstate' , popstate ) ;
window . addEventListener ( 'popstate' , popstate ) ;
window . PUSH = PUSH ;
window . PUSH = PUSH ;
} ( ) ;
} ( ) ) ;