0.4.19

nicolas-t · Sep 27, 2017 · 379898c · 379898c
1 parent 6dba183
commit 379898c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "chocolat",
-  "version": "0.4.18",
+  "version": "0.4.19",
   "main": [
     "dist/css/chocolat.css",
     "dist/js/jquery.chocolat.js"

diff --git a/dist/js/jquery.chocolat.js b/dist/js/jquery.chocolat.js
@@ -439,6 +439,10 @@
                 document.webkitExitFullscreen();
                 this.settings.fullscreenOpen = false;
             }
+            else if (document.msExitFullscreen) {
+                document.msExitFullscreen();
+                this.settings.fullscreenOpen = false;
+            }
             else {
                 this.settings.fullscreenOpen = true;
             }
@@ -565,7 +569,7 @@
 
             });
             $(window).on('resize', function() {
-                if (!that.settings.initialized) {
+                if (!that.settings.initialized || that.settings.currentImage === false)  {
                     return;
                 }
                 that.debounce(50, function() {
@@ -609,7 +613,7 @@
         },
 
         zoomOut : function (e, duration) {
-            if (this.settings.initialZoomState === null) {
+            if (this.settings.initialZoomState === null || this.settings.currentImage === false) {
                 return;
             }
             duration = duration || this.settings.duration;