Merge branch 'master' of https://github.com/hakimel/reveal.js into dev

This commit is contained in:
Hakim El Hattab 2013-04-24 10:27:02 -04:00
commit ab2d8d3eaa
3 changed files with 141 additions and 41 deletions

170
README.md

File diff suppressed because one or more lines are too long

View File

@ -1582,7 +1582,7 @@ var Reveal = (function(){
function navigateLeft() {
// Prioritize hiding fragments
if( availableRoutes().left && ( isOverview() || previousFragment() === false ) ) {
if( ( isOverview() || previousFragment() === false ) && availableRoutes().left ) {
slide( indexh - 1 );
}
@ -1591,7 +1591,7 @@ var Reveal = (function(){
function navigateRight() {
// Prioritize revealing fragments
if( availableRoutes().right && ( isOverview() || nextFragment() === false ) ) {
if( ( isOverview() || nextFragment() === false ) && availableRoutes().right ) {
slide( indexh + 1 );
}
@ -1600,7 +1600,7 @@ var Reveal = (function(){
function navigateUp() {
// Prioritize hiding fragments
if( availableRoutes().up && isOverview() || previousFragment() === false ) {
if( ( isOverview() || previousFragment() === false ) && availableRoutes().up ) {
slide( indexh, indexv - 1 );
}
@ -1609,7 +1609,7 @@ var Reveal = (function(){
function navigateDown() {
// Prioritize revealing fragments
if( availableRoutes().down && isOverview() || nextFragment() === false ) {
if( ( isOverview() || nextFragment() === false ) && availableRoutes().down ) {
slide( indexh, indexv + 1 );
}

4
js/reveal.min.js vendored

File diff suppressed because one or more lines are too long