(presentation) Moved present and article mode functions outside of their event listeners and updated keyboard to use the functions

Button clicking isn't very well supported for older browsers

2 files changed, 9 insertions, 4 deletions

diff --git a/src/scripts/keyboard.js b/src/scripts/keyboard.js
index 2609cfe..bacbea1 100644
--- a/src/scripts/keyboard.js
+++ b/src/scripts/keyboard.js
@@ -22,11 +22,11 @@ document.addEventListener('keydown', function (e) {
 			break;
 		// Start (toggle) presenting
 		case 'KeyP': case 'KeyT':
-			presentBtn.click();
+			togglePresentMode();
 			break;
 		// Exit presentation
 		case 'Escape':
-			if (presenting) presentBtn.click();
+			if (presenting) togglePresentMode();
 			break;
 		// Go to first slide
 		case 'Home':
diff --git a/src/scripts/presentation.js b/src/scripts/presentation.js
index 1a9b42c..98849a2 100644
--- a/src/scripts/presentation.js
+++ b/src/scripts/presentation.js
@@ -57,7 +57,7 @@ const articleBtn = document.getElementById('articleBtn');
 var pageY = 0;
 var pageX = 0;
 
-presentBtn.addEventListener('click', function() {
+function togglePresentMode() {
 	// Hide the whole page
 	document.body.classList.toggle('invisible');
 	document.body.classList.toggle('no-overflow');
@@ -88,6 +88,8 @@ presentBtn.addEventListener('click', function() {
 	presenting = !presenting;
 	fixAbsoluteSlideScale();
 });
+}
+presentBtn.addEventListener('click', togglePresentMode);
 
 function fixAbsoluteSlideScale() {
 	var height = (presenting) ? window.innerHeight : articleElem.offsetHeight;
@@ -106,9 +108,12 @@ window.addEventListener('load', fixAbsoluteSlideScale);
 
 /* Show as article button */
 
-articleBtn.addEventListener('click', function() {
+function toggleArticleMode() {
 	printBtn.classList.toggle('nodisplay');
 	presentBtn.classList.toggle('nodisplay');
 	// Toggle presentation.css
 	document.styleSheets.item(3).disabled = !document.styleSheets.item(3).disabled;
+}
+articleBtn.addEventListener('click', toggleArticleMode);
+window.addEventListener('load', function() {
 });