Skip to content

Add "o" as overview navigation #717

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

Closed
giflw wants to merge 1 commit into from
+69 −1
Closed

Add "o" as overview navigation #717

Show file tree
Hide file tree
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
36 changes: 35 additions & 1 deletion js/impress.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3140,9 +3140,19 @@
( function( document ) {
"use strict";

var overviewId = "impress-overview";

// Wait for impress.js to be initialized
document.addEventListener( "impress:init", function( event ) {

var root = event.target;

var hasOverview = root.querySelector( "#" + overviewId );

// Check if actual slide is overview
var inOverview = hasOverview && root.querySelector( ".active" ).id === overviewId;
var lastStep = 0;

// Getting API from event data.
// So you don't event need to know what is the id of the root element
// or anything. `impress:init` event data gives you everything you
Expand All @@ -3151,6 +3161,11 @@
var gc = api.lib.gc;
var util = api.lib.util;

// Pause autoplay if starts in overview
if ( inOverview ) {
util.triggerEvent( root, "impress:autoplay:pause" );
}

// Supported keys are:
// [space] - quite common in presentation software to move forward
// [up] [right] / [down] [left] - again common and natural addition,
Expand Down Expand Up @@ -3182,6 +3197,11 @@
return false;
}

// Overview key is O
if ( hasOverview && event.keyCode === 79 ) {
return true;
}

if ( ( event.keyCode >= 32 && event.keyCode <= 34 ) ||
( event.keyCode >= 37 && event.keyCode <= 40 ) ) {
return true;
Expand Down Expand Up @@ -3220,6 +3240,20 @@
case 40: // Down
api.next( event );
break;
case 79: // O (letter o)
if ( !hasOverview ) {
break;
}
if ( inOverview ) {
util.triggerEvent( event.target, "impress:autoplay:resume" );
api.goto( lastStep );
} else {
lastStep = root.querySelector( ".active" );
api.goto( overviewId );
util.triggerEvent( event.target, "impress:autoplay:pause" );
}
inOverview = !inOverview;
break;
}
}
event.preventDefault();
Expand Down Expand Up @@ -3297,7 +3331,7 @@
// Add a line to the help popup
util.triggerEvent( document, "impress:help:add", { command: "Left &amp; Right",
text: "Previous &amp; Next step",
row: 1 } );
row: 1, short: true } );

}, false );

Expand Down
34 changes: 34 additions & 0 deletions src/plugins/navigation/navigation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,19 @@
( function( document ) {
"use strict";

var overviewId = "impress-overview";

// Wait for impress.js to be initialized
document.addEventListener( "impress:init", function( event ) {

var root = event.target;

var hasOverview = root.querySelector( "#" + overviewId );

// Check if actual slide is overview
var inOverview = hasOverview && root.querySelector( ".active" ).id === overviewId;
var lastStep = 0;

// Getting API from event data.
// So you don't event need to know what is the id of the root element
// or anything. `impress:init` event data gives you everything you
Expand All @@ -36,6 +46,11 @@
var gc = api.lib.gc;
var util = api.lib.util;

// Pause autoplay if starts in overview
if ( inOverview ) {
util.triggerEvent( root, "impress:autoplay:pause" );
}

// Supported keys are:
// [space] - quite common in presentation software to move forward
// [up] [right] / [down] [left] - again common and natural addition,
Expand Down Expand Up @@ -67,6 +82,11 @@
return false;
}

// Overview key is O
if ( hasOverview && event.keyCode === 79 ) {
return true;
}

if ( ( event.keyCode >= 32 && event.keyCode <= 34 ) ||
( event.keyCode >= 37 && event.keyCode <= 40 ) ) {
return true;
Expand Down Expand Up @@ -105,6 +125,20 @@
case 40: // Down
api.next( event );
break;
case 79: // O (letter o)
if ( !hasOverview ) {
break;
}
if ( inOverview ) {
util.triggerEvent( event.target, "impress:autoplay:resume" );
api.goto( lastStep );
} else {
lastStep = root.querySelector( ".active" );
api.goto( overviewId );
util.triggerEvent( event.target, "impress:autoplay:pause" );
}
inOverview = !inOverview;
break;
}
}
event.preventDefault();
Expand Down
⚡