available fragment routes reflected in control arrows (closes #411)
This commit is contained in:
parent
0ebda98735
commit
6cfc6ecc49
|
@ -369,11 +369,11 @@ body {
|
|||
height: 0;
|
||||
border: 12px solid transparent;
|
||||
|
||||
-webkit-transition: opacity 0.2s ease;
|
||||
-moz-transition: opacity 0.2s ease;
|
||||
-ms-transition: opacity 0.2s ease;
|
||||
-o-transition: opacity 0.2s ease;
|
||||
transition: opacity 0.2s ease;
|
||||
-webkit-transition: all 0.2s ease;
|
||||
-moz-transition: all 0.2s ease;
|
||||
-ms-transition: all 0.2s ease;
|
||||
-o-transition: all 0.2s ease;
|
||||
transition: all 0.2s ease;
|
||||
}
|
||||
|
||||
.reveal .controls div.enabled {
|
||||
|
@ -385,35 +385,49 @@ body {
|
|||
margin-top: 1px;
|
||||
}
|
||||
|
||||
.reveal .controls div.navigate-left {
|
||||
.reveal .controls div.navigate-left {
|
||||
top: 42px;
|
||||
|
||||
border-right-width: 22px;
|
||||
border-right-color: #eee;
|
||||
}
|
||||
}
|
||||
.reveal .controls div.navigate-left.fragmented {
|
||||
left: 4px;
|
||||
border-right-width: 18px;
|
||||
}
|
||||
|
||||
.reveal .controls div.navigate-right {
|
||||
.reveal .controls div.navigate-right {
|
||||
left: 74px;
|
||||
top: 42px;
|
||||
|
||||
border-left-width: 22px;
|
||||
border-left-color: #eee;
|
||||
}
|
||||
}
|
||||
.reveal .controls div.navigate-right.fragmented {
|
||||
border-left-width: 18px;
|
||||
}
|
||||
|
||||
.reveal .controls div.navigate-up {
|
||||
.reveal .controls div.navigate-up {
|
||||
left: 42px;
|
||||
|
||||
border-bottom-width: 22px;
|
||||
border-bottom-color: #eee;
|
||||
}
|
||||
}
|
||||
.reveal .controls div.navigate-up.fragmented {
|
||||
top: 4px;
|
||||
border-bottom-width: 18px;
|
||||
}
|
||||
|
||||
.reveal .controls div.navigate-down {
|
||||
.reveal .controls div.navigate-down {
|
||||
left: 42px;
|
||||
top: 74px;
|
||||
|
||||
border-top-width: 22px;
|
||||
border-top-color: #eee;
|
||||
}
|
||||
}
|
||||
.reveal .controls div.navigate-down.fragmented {
|
||||
border-top-width: 18px;
|
||||
}
|
||||
|
||||
|
||||
/*********************************************
|
||||
|
|
2
css/reveal.min.css
vendored
2
css/reveal.min.css
vendored
File diff suppressed because one or more lines are too long
52
js/reveal.js
52
js/reveal.js
|
@ -1328,6 +1328,7 @@ var Reveal = (function(){
|
|||
if ( config.controls && dom.controls ) {
|
||||
|
||||
var routes = availableRoutes();
|
||||
var fragments = availableFragments();
|
||||
|
||||
// Remove the 'enabled' class from all directions
|
||||
dom.controlsLeft.concat( dom.controlsRight )
|
||||
|
@ -1336,6 +1337,7 @@ var Reveal = (function(){
|
|||
.concat( dom.controlsPrev )
|
||||
.concat( dom.controlsNext ).forEach( function( node ) {
|
||||
node.classList.remove( 'enabled' );
|
||||
node.classList.remove( 'fragmented' );
|
||||
} );
|
||||
|
||||
// Add the 'enabled' class to the available routes
|
||||
|
@ -1348,6 +1350,26 @@ var Reveal = (function(){
|
|||
if( routes.left || routes.up ) dom.controlsPrev.forEach( function( el ) { el.classList.add( 'enabled' ); } );
|
||||
if( routes.right || routes.down ) dom.controlsNext.forEach( function( el ) { el.classList.add( 'enabled' ); } );
|
||||
|
||||
// Highlight fragment directions
|
||||
if( currentSlide ) {
|
||||
var isVertical = !!currentSlide.parentNode.nodeName.match( /section/gi );
|
||||
|
||||
// Always apply fragment decorator to prev/next buttons
|
||||
if( fragments.prev ) dom.controlsPrev.forEach( function( el ) { el.classList.add( 'fragmented', 'enabled' ); } );
|
||||
if( fragments.next ) dom.controlsNext.forEach( function( el ) { el.classList.add( 'fragmented', 'enabled' ); } );
|
||||
|
||||
// Apply fragment decorators to directional buttons based on
|
||||
// what slide axis they are in
|
||||
if( isVertical ) {
|
||||
if( fragments.prev ) dom.controlsUp.forEach( function( el ) { el.classList.add( 'fragmented', 'enabled' ); } );
|
||||
if( fragments.next ) dom.controlsDown.forEach( function( el ) { el.classList.add( 'fragmented', 'enabled' ); } );
|
||||
}
|
||||
else {
|
||||
if( fragments.prev ) dom.controlsLeft.forEach( function( el ) { el.classList.add( 'fragmented', 'enabled' ); } );
|
||||
if( fragments.next ) dom.controlsRight.forEach( function( el ) { el.classList.add( 'fragmented', 'enabled' ); } );
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -1371,6 +1393,29 @@ var Reveal = (function(){
|
|||
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns an object describing the available fragment
|
||||
* directions.
|
||||
*
|
||||
* @return {Object} two boolean properties: prev/next
|
||||
*/
|
||||
function availableFragments() {
|
||||
|
||||
if( currentSlide ) {
|
||||
var fragments = currentSlide.querySelectorAll( '.fragment' );
|
||||
var hiddenFragments = currentSlide.querySelectorAll( '.fragment:not(.visible)' );
|
||||
|
||||
return {
|
||||
prev: fragments.length - hiddenFragments.length > 0,
|
||||
next: !!hiddenFragments.length
|
||||
};
|
||||
}
|
||||
else {
|
||||
return { prev: false, next: false };
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Reads the current URL (hash) and navigates accordingly.
|
||||
*/
|
||||
|
@ -1506,6 +1551,8 @@ var Reveal = (function(){
|
|||
|
||||
// Notify subscribers of the change
|
||||
dispatchEvent( 'fragmentshown', { fragment: fragments[0] } );
|
||||
|
||||
updateControls();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
@ -1530,6 +1577,8 @@ var Reveal = (function(){
|
|||
|
||||
// Notify subscribers of the change
|
||||
dispatchEvent( 'fragmenthidden', { fragment: fragments[ fragments.length - 1 ] } );
|
||||
|
||||
updateControls();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
@ -1992,6 +2041,9 @@ var Reveal = (function(){
|
|||
// Returns an object with the available routes as booleans (left/right/top/bottom)
|
||||
availableRoutes: availableRoutes,
|
||||
|
||||
// Returns an object with the available fragments as booleans (prev/next)
|
||||
availableFragments: availableFragments,
|
||||
|
||||
// Toggles the overview mode on/off
|
||||
toggleOverview: toggleOverview,
|
||||
|
||||
|
|
4
js/reveal.min.js
vendored
4
js/reveal.min.js
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user