blallo/talk-hm-0x15
1
0
Fork 1
Code Issues Pull requests Releases Wiki Activity

Merge branch 'shift-space' of https://github.com/remybach/reveal.js into dev

Browse source
This commit is contained in:
Hakim El Hattab 2013-03-17 08:04:02 -04:00
commit 7439a45b9b
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
js/reveal.js
View file

@ -1656,7 +1656,7 @@ var Reveal = (function(){
// Disregard the event if there's a focused element or a
// keyboard modifier key is present
if( hasFocus || event.shiftKey || event.altKey || event.ctrlKey || event.metaKey ) return;
if( hasFocus || (event.shiftKey && event.keyCode !== 32) || event.altKey || event.ctrlKey || event.metaKey ) return;
var triggered = true;
@ -1683,7 +1683,7 @@ var Reveal = (function(){
// end
case 35: slide( Number.MAX_VALUE ); break;
// space
case 32: isOverview() ? deactivateOverview() : navigateNext(); break;
case 32: isOverview() ? deactivateOverview() : event.shiftKey ? navigatePrev() : navigateNext(); break;
// return
case 13: isOverview() ? deactivateOverview() : triggered = false; break;
// b, period, Logitech presenter tools "black screen" button

16
js/reveal.min.js vendored
View file

File diff suppressed because one or more lines are too long