Merge pull request #2991 from ONLYOFFICE/feature/repaire-mobile-fulls…

…creen Feature/repaire mobile fullscreen
ONLYOFFICE · May 17, 2024 · 6400cb9 · 6400cb9
2 parents 1955a20 + a97618b
commit 6400cb9
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 19 deletions.
diff --git a/apps/common/main/lib/util/utils.js b/apps/common/main/lib/util/utils.js
@@ -1049,6 +1049,32 @@ Common.Utils.injectComponent = function ($slot, cmp) {
     }
 };
 
+Common.Utils.startFullscreenForElement = function (element) {
+    if (element) {
+        if(element.requestFullscreen) {
+            element.requestFullscreen();
+        } else if(element.webkitRequestFullscreen) {
+            element.webkitRequestFullscreen();
+        } else if(element.mozRequestFullScreen) {
+            element.mozRequestFullScreen();
+        } else if(element.msRequestFullscreen) {
+            element.msRequestFullscreen();
+        }
+    }
+}
+
+Common.Utils.cancelFullscreen = function () {
+    if(document.cancelFullScreen) {
+        document.cancelFullScreen();
+    } else if(document.webkitCancelFullScreen ) {
+        document.webkitCancelFullScreen();
+    } else if(document.mozCancelFullScreen) {
+        document.mozCancelFullScreen();
+    } else if(document.msExitFullscreen) {
+        document.msExitFullscreen();
+    }
+}
+
 Common.Utils.warningDocumentIsLocked = function (opts) {
     if ( opts.disablefunc )
         opts.disablefunc(true);

diff --git a/apps/presentationeditor/main/app/controller/Viewport.js b/apps/presentationeditor/main/app/controller/Viewport.js
@@ -278,7 +278,7 @@ define([
                 };
                 if (!me.viewport.mode.isDesktopApp && !Common.Utils.isIE11 && !presenter && !!document.fullscreenEnabled) {
                     Common.NotificationCenter.on('window:resize', _onWindowResize);
-                    !fromApiEvent && me.fullScreen(document.documentElement);
+                    !fromApiEvent && Common.Utils.startFullscreenForElement($("#pe-preview").get(0));
                     setTimeout(function(){
                         _onWindowResize();
                     }, 100);
@@ -287,20 +287,6 @@ define([
             }
         },
 
-        fullScreen: function(element) {
-            if (element) {
-                if(element.requestFullscreen) {
-                    element.requestFullscreen();
-                } else if(element.webkitRequestFullscreen) {
-                    element.webkitRequestFullscreen();
-                } else if(element.mozRequestFullScreen) {
-                    element.mozRequestFullScreen();
-                } else if(element.msRequestFullscreen) {
-                    element.msRequestFullscreen();
-                }
-            }
-        },
-
         onFileMenu: function (opts) {
             var me = this;
             var _need_disable =  opts == 'show';

diff --git a/apps/presentationeditor/main/app/view/DocumentPreview.js b/apps/presentationeditor/main/app/view/DocumentPreview.js
@@ -375,7 +375,7 @@ define([
 
         onEndDemonstration: function( ) {
             this.hide();
-            this.fullScreenCancel();
+            Common.Utils.cancelFullscreen();
         },
 
         onDemonstrationStatus: function(status) {
@@ -386,10 +386,17 @@ define([
 
         toggleFullScreen: function() {
             if (!document.fullscreenElement && !document.msFullscreenElement && 
-                !document.mozFullScreenElement && !document.webkitFullscreenElement) {
-                this.fullScreen(document.documentElement);
+                !document.mozFullScreenElement && !document.webkitFullscreenElement)
+            {
+                if (this.mode.isDesktopApp || Common.Utils.isIE11) return;
+                const elem = document.getElementById('pe-preview');
+                if ( elem ) {
+                    Common.Utils.startFullscreenForElement(elem);
+                    this.previewControls.css('display', 'none');
+                    this.$el.css('cursor', 'none');
+                }
             } else {
-                this.fullScreenCancel();
+                Common.Utils.cancelFullscreen();
             }
         },