Fix #125

nicolas-t · Feb 26, 2021 · 299d29b · 299d29b
1 parent 66b2fb4
commit 299d29b
Show file tree

Hide file tree

Showing 6 changed files with 2,704 additions and 14 deletions.
diff --git a/dist/js/chocolat.cjs.js b/dist/js/chocolat.cjs.js
@@ -273,7 +273,7 @@ class Chocolat {
     }
 
     if (this.settings.fullScreen) {
-      this.state.fullScreenOpen = openFullScreen(this.elems.wrapper);
+      openFullScreen(this.elems.wrapper);
     }
 
     if (this.settings.currentImageIndex === index) {
@@ -429,7 +429,7 @@ class Chocolat {
     }
 
     if (this.state.fullScreenOpen) {
-      this.state.fullScreenOpen = exitFullScreen();
+      exitFullScreen();
     }
 
     this.settings.currentImageIndex = undefined;
@@ -542,7 +542,15 @@ class Chocolat {
     });
     this.off(document, 'fullscreenchange.chocolat');
     this.on(document, 'fullscreenchange.chocolat', () => {
-      if (document.fullscreenElement) {
+      if (document.fullscreenElement || document.webkitCurrentFullScreenElement || document.webkitFullscreenElement) {
+        this.state.fullScreenOpen = true;
+      } else {
+        this.state.fullScreenOpen = false;
+      }
+    });
+    this.off(document, 'webkitfullscreenchange.chocolat');
+    this.on(document, 'webkitfullscreenchange.chocolat', () => {
+      if (document.fullscreenElement || document.webkitCurrentFullScreenElement || document.webkitFullscreenElement) {
         this.state.fullScreenOpen = true;
       } else {
         this.state.fullScreenOpen = false;

diff --git a/dist/js/chocolat.esm.js b/dist/js/chocolat.esm.js
@@ -271,7 +271,7 @@ class Chocolat {
     }
 
     if (this.settings.fullScreen) {
-      this.state.fullScreenOpen = openFullScreen(this.elems.wrapper);
+      openFullScreen(this.elems.wrapper);
     }
 
     if (this.settings.currentImageIndex === index) {
@@ -427,7 +427,7 @@ class Chocolat {
     }
 
     if (this.state.fullScreenOpen) {
-      this.state.fullScreenOpen = exitFullScreen();
+      exitFullScreen();
     }
 
     this.settings.currentImageIndex = undefined;
@@ -540,7 +540,15 @@ class Chocolat {
     });
     this.off(document, 'fullscreenchange.chocolat');
     this.on(document, 'fullscreenchange.chocolat', () => {
-      if (document.fullscreenElement) {
+      if (document.fullscreenElement || document.webkitCurrentFullScreenElement || document.webkitFullscreenElement) {
+        this.state.fullScreenOpen = true;
+      } else {
+        this.state.fullScreenOpen = false;
+      }
+    });
+    this.off(document, 'webkitfullscreenchange.chocolat');
+    this.on(document, 'webkitfullscreenchange.chocolat', () => {
+      if (document.fullscreenElement || document.webkitCurrentFullScreenElement || document.webkitFullscreenElement) {
         this.state.fullScreenOpen = true;
       } else {
         this.state.fullScreenOpen = false;

diff --git a/dist/js/chocolat.js b/dist/js/chocolat.js
@@ -274,7 +274,7 @@
         }
 
         if (this.settings.fullScreen) {
-          this.state.fullScreenOpen = openFullScreen(this.elems.wrapper);
+          openFullScreen(this.elems.wrapper);
         }
 
         if (this.settings.currentImageIndex === index) {
@@ -430,7 +430,7 @@
         }
 
         if (this.state.fullScreenOpen) {
-          this.state.fullScreenOpen = exitFullScreen();
+          exitFullScreen();
         }
 
         this.settings.currentImageIndex = undefined;
@@ -543,7 +543,15 @@
         });
         this.off(document, 'fullscreenchange.chocolat');
         this.on(document, 'fullscreenchange.chocolat', () => {
-          if (document.fullscreenElement) {
+          if (document.fullscreenElement || document.webkitCurrentFullScreenElement || document.webkitFullscreenElement) {
+            this.state.fullScreenOpen = true;
+          } else {
+            this.state.fullScreenOpen = false;
+          }
+        });
+        this.off(document, 'webkitfullscreenchange.chocolat');
+        this.on(document, 'webkitfullscreenchange.chocolat', () => {
+          if (document.fullscreenElement || document.webkitCurrentFullScreenElement || document.webkitFullscreenElement) {
             this.state.fullScreenOpen = true;
           } else {
             this.state.fullScreenOpen = false;