greatly improved rtl, slides and progress are now reversed #339

This commit is contained in:
Hakim El Hattab 2013-04-29 21:54:39 -04:00
parent f210e7b1b5
commit 0306e0fa0d
4 changed files with 44 additions and 16 deletions

View File

@ -1329,6 +1329,10 @@ body {
text-align: right; text-align: right;
} }
.reveal.rtl .progress span {
float: right
}
/********************************************* /*********************************************
* SPEAKER NOTES * SPEAKER NOTES

2
css/reveal.min.css vendored

File diff suppressed because one or more lines are too long

View File

@ -787,7 +787,8 @@ var Reveal = (function(){
for( var i = 0, len1 = horizontalSlides.length; i < len1; i++ ) { for( var i = 0, len1 = horizontalSlides.length; i < len1; i++ ) {
var hslide = horizontalSlides[i], var hslide = horizontalSlides[i],
htransform = 'translateZ(-2500px) translate(' + ( ( i - indexh ) * 105 ) + '%, 0%)'; hoffset = config.rtl ? -105 : 105,
htransform = 'translateZ(-2500px) translate(' + ( ( i - indexh ) * hoffset ) + '%, 0%)';
hslide.setAttribute( 'data-index-h', i ); hslide.setAttribute( 'data-index-h', i );
hslide.style.display = 'block'; hslide.style.display = 'block';
@ -1228,22 +1229,24 @@ var Reveal = (function(){
element.style.display = distance > 3 ? 'none' : 'block'; element.style.display = distance > 3 ? 'none' : 'block';
} }
slides[i].classList.remove( 'past' ); var reverse = config.rtl && !element.parentNode.nodeName.match( /section/gi );
slides[i].classList.remove( 'present' );
slides[i].classList.remove( 'future' ); element.classList.remove( 'past' );
element.classList.remove( 'present' );
element.classList.remove( 'future' );
if( i < index ) { if( i < index ) {
// Any element previous to index is given the 'past' class // Any element previous to index is given the 'past' class
slides[i].classList.add( 'past' ); element.classList.add( reverse ? 'future' : 'past' );
} }
else if( i > index ) { else if( i > index ) {
// Any element subsequent to index is given the 'future' class // Any element subsequent to index is given the 'future' class
slides[i].classList.add( 'future' ); element.classList.add( reverse ? 'past' : 'future' );
} }
// If this element contains vertical slides // If this element contains vertical slides
if( element.querySelector( 'section' ) ) { if( element.querySelector( 'section' ) ) {
slides[i].classList.add( 'stack' ); element.classList.add( 'stack' );
} }
} }
@ -1391,13 +1394,22 @@ var Reveal = (function(){
var horizontalSlides = document.querySelectorAll( HORIZONTAL_SLIDES_SELECTOR ), var horizontalSlides = document.querySelectorAll( HORIZONTAL_SLIDES_SELECTOR ),
verticalSlides = document.querySelectorAll( VERTICAL_SLIDES_SELECTOR ); verticalSlides = document.querySelectorAll( VERTICAL_SLIDES_SELECTOR );
return { var routes = {
left: indexh > 0 || config.loop, left: indexh > 0 || config.loop,
right: indexh < horizontalSlides.length - 1 || config.loop, right: indexh < horizontalSlides.length - 1 || config.loop,
up: indexv > 0, up: indexv > 0,
down: indexv < verticalSlides.length - 1 down: indexv < verticalSlides.length - 1
}; };
// reverse horizontal controls for rtl
if( config.rtl ) {
var left = routes.left;
routes.left = routes.right;
routes.right = left;
}
return routes;
} }
/** /**
@ -1667,8 +1679,14 @@ var Reveal = (function(){
function navigateLeft() { function navigateLeft() {
// Prioritize hiding fragments // Reverse for RTL
if( ( isOverview() || previousFragment() === false ) && availableRoutes().left ) { if( config.rtl ) {
if( ( isOverview() || nextFragment() === false ) && availableRoutes().left ) {
slide( indexh + 1 );
}
}
// Normal navigation
else if( ( isOverview() || previousFragment() === false ) && availableRoutes().left ) {
slide( indexh - 1 ); slide( indexh - 1 );
} }
@ -1676,8 +1694,14 @@ var Reveal = (function(){
function navigateRight() { function navigateRight() {
// Prioritize revealing fragments // Reverse for RTL
if( ( isOverview() || nextFragment() === false ) && availableRoutes().right ) { if( config.rtl ) {
if( ( isOverview() || previousFragment() === false ) && availableRoutes().right ) {
slide( indexh - 1 );
}
}
// Normal navigation
else if( ( isOverview() || nextFragment() === false ) && availableRoutes().right ) {
slide( indexh + 1 ); slide( indexh + 1 );
} }
@ -2187,4 +2211,4 @@ var Reveal = (function(){
} }
}; };
})(); })();

4
js/reveal.min.js vendored

File diff suppressed because one or more lines are too long