Shivan/tubestats-presentation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

prevent duplicate slidechange from firing after hash change (closes #54)

Browse Source
This commit is contained in:
Hakim El Hattab
2012-06-06 22:22:13 -04:00
parent 5a782e54f8
commit 2b6c61060b
2 changed files with 26 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
js/reveal.js
View File

@@ -610,16 +610,19 @@ var Reveal = (function(){
* Updates the visual slides to represent the currently
* set indices.
*/
function slide() {
function slide( h, v ) {
// Remember the state before this slide
var stateBefore = state.concat();
// Reset the state array
state.length = 0;
var indexhBefore = indexh,
indexvBefore = indexv;
// Activate and transition to the new slide
indexh = updateSlides( HORIZONTAL_SLIDES_SELECTOR, indexh );
indexv = updateSlides( VERTICAL_SLIDES_SELECTOR, indexv );
indexh = updateSlides( HORIZONTAL_SLIDES_SELECTOR, h === undefined ? indexh : h );
indexv = updateSlides( VERTICAL_SLIDES_SELECTOR, v === undefined ? indexv : v );
// Apply the new state
stateLoop: for( var i = 0, len = state.length; i < len; i++ ) {
@@ -658,11 +661,13 @@ var Reveal = (function(){
clearTimeout( writeURLTimeout );
writeURLTimeout = setTimeout( writeURL, 1500 );
// Dispatch an event notifying observers of the change in slide
dispatchEvent( 'slidechanged', {
'indexh': indexh,
'indexv': indexv
} );
if( indexh !== indexhBefore || indexv !== indexvBefore ) {
// Dispatch an event notifying observers of the change in slide
dispatchEvent( 'slidechanged', {
'indexh': indexh,
'indexv': indexv
} );
}
}
/**
@@ -814,40 +819,31 @@ var Reveal = (function(){
* @param {Number} v The vertical index of the slide to show
*/
function navigateTo( h, v ) {
indexh = h === undefined ? indexh : h;
indexv = v === undefined ? indexv : v;
slide();
slide( h, v );
}
function navigateLeft() {
// Prioritize hiding fragments
if( overviewIsActive() || previousFragment() === false ) {
indexh --;
indexv = 0;
slide();
slide( indexh - 1, 0 );
}
}
function navigateRight() {
// Prioritize revealing fragments
if( overviewIsActive() || nextFragment() === false ) {
indexh ++;
indexv = 0;
slide();
slide( indexh + 1, 0 );
}
}
function navigateUp() {
// Prioritize hiding fragments
if( overviewIsActive() || previousFragment() === false ) {
indexv --;
slide();
slide( indexh, indexv - 1 );
}
}
function navigateDown() {
// Prioritize revealing fragments
if( overviewIsActive() || nextFragment() === false ) {
indexv ++;
slide();
slide( indexh, indexv + 1 );
}
}