Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce random config #1506

Closed
wants to merge 1 commit into from
Closed

Introduce random config #1506

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 85 additions & 32 deletions js/reveal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,10 @@
viewDistance: 3,

// Script dependencies to load
dependencies: []
dependencies: [],

// Randomize slides
random: false

},

Expand Down Expand Up @@ -3736,32 +3739,39 @@

function navigateLeft() {

// Reverse for RTL
if( config.rtl ) {
if( ( isOverview() || nextFragment() === false ) && availableRoutes().left ) {
slide( indexh + 1 );
}
if( config.random ) {
navigateRandom(config.random.rangeStart, config.random.rangeEnd);
}
// Normal navigation
else if( ( isOverview() || previousFragment() === false ) && availableRoutes().left ) {
slide( indexh - 1 );
else {
// Reverse for RTL
if( config.rtl ) {
if( ( isOverview() || nextFragment() === false ) && availableRoutes().left ) {
slide( indexh + 1 );
}
}
// Normal navigation
else if( ( isOverview() || previousFragment() === false ) && availableRoutes().left ) {
slide( indexh - 1 );
}
}

}

function navigateRight() {

// Reverse for RTL
if( config.rtl ) {
if( ( isOverview() || previousFragment() === false ) && availableRoutes().right ) {
slide( indexh - 1 );
}
if( config.random ) {
navigateRandom(config.random.rangeStart, config.random.rangeEnd);
}
// Normal navigation
else if( ( isOverview() || nextFragment() === false ) && availableRoutes().right ) {
slide( indexh + 1 );
else {
// Reverse for RTL
if( config.rtl ) {
if( ( isOverview() || previousFragment() === false ) && availableRoutes().right ) {
slide( indexh - 1 );
}
}
// Normal navigation
else if( ( isOverview() || nextFragment() === false ) && availableRoutes().right ) {
slide( indexh + 1 );
}
}

}

function navigateUp() {
Expand All @@ -3782,6 +3792,38 @@

}

function navigateRandom(randomRangeStart, randomRangeEnd) {
var rangeStart = randomRangeStart || 0;
var rangeEnd = randomRangeEnd || (toArray( dom.wrapper.querySelectorAll( HORIZONTAL_SLIDES_SELECTOR )).length - 1);

if( rangeEnd < rangeStart ) {
//swap the two values
rangeEnd = [rangeStart, rangeStart = rangeEnd][0];
}

var randomIndexH;
if ( rangeEnd - rangeStart <= 1 ) {
//no need to randomize if the range consists of one or two slides
randomIndexH = (rangeEnd === indexh) ? rangeStart : rangeEnd;
}
else {
do {
randomIndexH = Math.floor(Math.random() * rangeEnd) + rangeStart;
} while (randomIndexH === indexh); // keep randomizing if/until we don't come up with the same slide we're already on
}

// Reverse for RTL
if( config.rtl ) {
if( ( isOverview() || previousFragment() === false ) && availableRoutes().right ) {
slide( randomIndexH );
}
}
// Normal navigation
else if( ( isOverview() || nextFragment() === false ) && availableRoutes().right ) {
slide( randomIndexH );
}
}

/**
* Navigates backwards, prioritized in the following order:
* 1) Previous fragment
Expand All @@ -3796,20 +3838,26 @@
navigateUp();
}
else {
// Fetch the previous horizontal slide, if there is one
var previousSlide;

if( config.rtl ) {
previousSlide = toArray( dom.wrapper.querySelectorAll( HORIZONTAL_SLIDES_SELECTOR + '.future' ) ).pop();
if( config.random ) {
navigateRandom(config.random.rangeStart, config.random.rangeEnd);
}
else {
previousSlide = toArray( dom.wrapper.querySelectorAll( HORIZONTAL_SLIDES_SELECTOR + '.past' ) ).pop();
}
// Fetch the previous horizontal slide, if there is one
var previousSlide;

if( previousSlide ) {
var v = ( previousSlide.querySelectorAll( 'section' ).length - 1 ) || undefined;
var h = indexh - 1;
slide( h, v );
if( config.rtl ) {
previousSlide = toArray( dom.wrapper.querySelectorAll( HORIZONTAL_SLIDES_SELECTOR + '.future' ) ).pop();
}
else {
previousSlide = toArray( dom.wrapper.querySelectorAll( HORIZONTAL_SLIDES_SELECTOR + '.past' ) ).pop();
}

if( previousSlide ) {
var v = ( previousSlide.querySelectorAll( 'section' ).length - 1 ) || undefined;
var h = indexh - 1;
slide( h, v );
}
}
}
}
Expand All @@ -3821,8 +3869,13 @@
*/
function navigateNext() {

// Prioritize revealing fragments
if( nextFragment() === false ) {
//if autoslide is on and random is on, take over navigation: this check keep randomization at the top (horizontal) level
if( autoSlide && !autoSlidePaused && config.random ) {
navigateRandom(config.random.rangeStart, config.random.rangeEnd);
}
else if( nextFragment() === false ) {
// Prioritize revealing fragments

if( availableRoutes().down ) {
navigateDown();
}
Expand Down