Browse Source

update fullscreen

vian 5 years ago
parent
commit
00177f6bf6
2 changed files with 10 additions and 8 deletions
  1. 9 7
      public/common_util.js
  2. 1 1
      public/web/syntax-detection.js

+ 9 - 7
public/common_util.js

@@ -51,8 +51,7 @@
     // 通过F11打开全屏后,没有办法通过代码退出全屏,只能通过F11退出:
     // https://stackoverflow.com/questions/51114885/combining-requestfullscreen-and-f11; https://stackoverflow.com/questions/43392583/fullscreen-api-not-working-if-triggered-with-f11/44368592#44368592;
     function handleFullscreen() {
-        const isFullscreen = window.innerHeight === window.screen.height;
-        if (isFullscreen) {
+        if (isFullscreen()) {
             const p = exitFullscreen();
             if (Object.prototype.toString.call(p) === '[object Promise]') {
                 p.catch(() => alert('按F11即可退出全屏模式'));
@@ -61,10 +60,13 @@
             fullscreen(document.documentElement);
         }
     }
+    function isFullscreen() {
+        return window.innerHeight === window.screen.height;
+    }
     function fullscreen(ele) {
         if (ele.requestFullscreen) {
             ele.requestFullscreen();
-        } else if (ele.mozRequestFullScreen) {
+        } else if (ele.mozRequestFullscreen) {
             ele.mozRequestFullScreen();
         } else if (ele.webkitRequestFullscreen) {
             ele.webkitRequestFullscreen();
@@ -73,10 +75,10 @@
         }
     }
     function exitFullscreen() {
-        if(document.exitFullScreen) {
-            return document.exitFullScreen();
-        } else if(document.mozCancelFullScreen) {
-            return document.mozCancelFullScreen();
+        if(document.exitFullscreen) {
+            return document.exitFullscreen();
+        } else if(document.mozCancelFullscreen) {
+            return document.mozCancelFullscreen();
         } else if(document.webkitExitFullscreen) {
             return document.webkitExitFullscreen();
         } else if(document.msExitFullscreen) {

+ 1 - 1
public/web/syntax-detection.js

@@ -152,7 +152,7 @@ function checkSyntax() {
 
         // DOM
         if (typeof document.documentElement.requestFullscreen !== 'function' && 
-            typeof document.documentElement.mozRequestFullScreen !== 'function' &&
+            typeof document.documentElement.mozRequestFullscreen !== 'function' &&
             typeof document.documentElement.webkitRequestFullscreen !== 'function' &&
             typeof document.documentElement.msRequestFullscreen !== 'function') {
             throw new TypeError('fullscreen is not a function');