Merge pull request #11750 from rtibbles/full_screens_for_everyone

Removes uncleaned up reference to isAndroidWebview.
learningequality · Jan 19, 2024 · ce3bacd · ce3bacd
2 parents a579274 + 5bc2159
commit ce3bacd
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/kolibri/core/assets/src/views/CoreFullscreen.vue b/kolibri/core/assets/src/views/CoreFullscreen.vue
@@ -14,9 +14,6 @@
 <script>
 
   import ScreenFull from 'screenfull';
-  import { isAndroidWebView } from 'kolibri.utils.browserInfo';
-
-  const fullscreenApiIsSupported = ScreenFull.isEnabled && !isAndroidWebView;
 
   const NORMALIZE_FULLSCREEN_CLASS = 'normalize-fullscreen';
   const MIMIC_FULLSCREEN_CLASS = 'mimic-fullscreen';
@@ -32,7 +29,7 @@
     computed: {
       fullscreenClass() {
         if (this.isInFullscreen) {
-          return fullscreenApiIsSupported ? NORMALIZE_FULLSCREEN_CLASS : MIMIC_FULLSCREEN_CLASS;
+          return ScreenFull.isEnabled ? NORMALIZE_FULLSCREEN_CLASS : MIMIC_FULLSCREEN_CLASS;
         }
         return null;
       },
@@ -46,7 +43,7 @@
     },
     mounted() {
       // Catch the use of the esc key to exit fullscreen
-      if (fullscreenApiIsSupported) {
+      if (ScreenFull.isEnabled) {
         ScreenFull.onchange(() => {
           this.isInFullscreen = ScreenFull.isFullscreen;
         });
@@ -60,13 +57,13 @@
         if (!this.toggling) {
           let fullScreenPromise;
           this.toggling = true;
-          if (fullscreenApiIsSupported) {
+          if (ScreenFull.isEnabled) {
             fullScreenPromise = ScreenFull.toggle(this.$refs.fullscreen);
           } else {
             fullScreenPromise = Promise.resolve();
           }
           fullScreenPromise.then(() => {
-            this.isInFullscreen = fullscreenApiIsSupported
+            this.isInFullscreen = ScreenFull.isEnabled
               ? ScreenFull.isFullscreen
               : !this.isInFullscreen;
             this.toggling = false;