diff --git a/src/main/webapp/js/presentation.js b/src/main/webapp/js/presentation.js index 790a2270b..cf46fd5fd 100644 --- a/src/main/webapp/js/presentation.js +++ b/src/main/webapp/js/presentation.js @@ -112,7 +112,7 @@ var createPresentation = function(contentJqObj) {// eslint-disable-line no-unuse slidehtml += '
'; slidehtml += '
1 / ' + slideLength; - slidehtml += '   '; + slidehtml += '   '; slidehtml += ''; /* いったんPDFダウンロードボタンはコメントアウト diff --git a/src/main/webapp/js/slide.js b/src/main/webapp/js/slide.js index cfe926344..7b091f5ed 100644 --- a/src/main/webapp/js/slide.js +++ b/src/main/webapp/js/slide.js @@ -1,36 +1,27 @@ var indexMap = {}; -var full = false; var slideCount = 0; var requestFullscreen = function(id) {// eslint-disable-line no-unused-vars - if (full) { + if (document.fullscreenElement) { if (document.webkitCancelFullScreen) { document.webkitCancelFullScreen(); - full = false; } else if (document.mozCancelFullScreen) { document.mozCancelFullScreen(); - full = false; } else if (document.msExitFullscreen) { document.msExitFullscreen(); - full = false; } else if (document.exitFullscreen) { document.exitFullscreen(); - full = false; } } else { var target = document.getElementById(id); if (target.requestFullscreen) { target.requestFullscreen(); // HTML5 Fullscreen API仕様 - full = true; } else if (target.webkitRequestFullscreen) { target.webkitRequestFullscreen(); //Chrome15+, Safari5.1+, Opera15+ - full = true; } else if (target.mozRequestFullScreen) { target.mozRequestFullScreen(); //FF10+ - full = true; } else if (target.msRequestFullscreen) { target.msRequestFullscreen(); //IE11+ - full = true; } else { $.notify('Fullscreen view is not supported.', 'warn'); return; @@ -84,7 +75,7 @@ var showSlide = function(parent) {// eslint-disable-line no-unused-vars slidehtml += ''; slidehtml += '
'; slidehtml += '
1 / ' + data.files.length; - slidehtml += '   '; + slidehtml += '   '; slidehtml += '
'; if (data.files.length < 60) { slidehtml += '
';