Merge branch 'dev' of github.com:ht push origin akimel/reveal.js into dev

This commit is contained in:
Hakim El Hattab 2014-04-01 09:14:43 +02:00
commit 9e78fe3ee2

View File

@ -2886,8 +2886,8 @@ var Reveal = (function(){
case 32: isOverview() ? deactivateOverview() : event.shiftKey ? navigatePrev() : navigateNext(); break; case 32: isOverview() ? deactivateOverview() : event.shiftKey ? navigatePrev() : navigateNext(); break;
// return // return
case 13: isOverview() ? deactivateOverview() : triggered = false; break; case 13: isOverview() ? deactivateOverview() : triggered = false; break;
// b, period, Logitech presenter tools "black screen" button // two-spot, semicolon, b, period, Logitech presenter tools "black screen" button
case 66: case 190: case 191: togglePause(); break; case 58: case 59: case 66: case 190: case 191: togglePause(); break;
// f // f
case 70: enterFullscreen(); break; case 70: enterFullscreen(); break;
// a // a