|
@@ -155,33 +155,32 @@ var Reveal = (function(){
|
|
|
|
|
|
|
|
|
|
|
|
- if( event.target.contentEditable === 'inherit' ) {
|
|
|
- if( event.keyCode >= 33 && event.keyCode <= 40 ) {
|
|
|
+ if ( event.target.contentEditable != 'inherit' ||
|
|
|
+ event.shiftKey || event.altKey || event.ctrlKey ) return;
|
|
|
|
|
|
- switch( event.keyCode ) {
|
|
|
- case 33: navigatePrev(); break;
|
|
|
- case 34: navigateNext(); break;
|
|
|
- case 37: navigateLeft(); break;
|
|
|
- case 39: navigateRight(); break;
|
|
|
- case 38: navigateUp(); break;
|
|
|
- case 40: navigateDown(); break;
|
|
|
- }
|
|
|
-
|
|
|
- event.preventDefault();
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- else if ( event.keyCode === 32 && supports3DTransforms ) {
|
|
|
- if( overviewIsActive() ) {
|
|
|
- deactivateOverview();
|
|
|
- }
|
|
|
- else {
|
|
|
- activateOverview();
|
|
|
- }
|
|
|
+ var triggered = false;
|
|
|
+ switch( event.keyCode ) {
|
|
|
+ case 33: navigatePrev(); triggered = true; break;
|
|
|
+ case 32: case 34: navigateNext(); triggered = true; break;
|
|
|
+ case 72: case 37: navigateLeft(); triggered = true; break;
|
|
|
+ case 76: case 39: navigateRight(); triggered = true; break;
|
|
|
+ case 75: case 38: navigateUp(); triggered = true; break;
|
|
|
+ case 74: case 40: navigateDown(); triggered = true; break;
|
|
|
+ }
|
|
|
+ if (triggered) return event.preventDefault()
|
|
|
|
|
|
- event.preventDefault();
|
|
|
+ if ( event.keyCode === 27 && supports3DTransforms ) {
|
|
|
+
|
|
|
+ if( overviewIsActive() ) {
|
|
|
+ deactivateOverview();
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ activateOverview();
|
|
|
}
|
|
|
+
|
|
|
+ event.preventDefault();
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
|
|
|
|
|
@@ -231,6 +230,7 @@ var Reveal = (function(){
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
|
|
|
* Handles mouse wheel scrolling, throttled to avoid
|
|
|
* skipping multiple slides.
|