Updated to v3.5.5

- Fixed #2150 - Caption is not cleared
fancyapps · Dec 13, 2018 · 4658124 · 4658124
1 parent f5e272a
commit 4658124
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 24 deletions.
diff --git a/dist/jquery.fancybox.js b/dist/jquery.fancybox.js
@@ -1,5 +1,5 @@
 // ==================================================
-// fancyBox v3.5.4
+// fancyBox v3.5.5
 //
 // Licensed GPLv3 for open source use
 // or fancyBox Commercial License for commercial use
@@ -2303,24 +2303,26 @@
       var self = this,
         current = slide || self.current,
         caption = current.opts.caption,
+        preventOverlap = current.opts.preventCaptionOverlap,
         $caption = self.$refs.caption,
-        captionH = false,
-        preventOverlap = current.opts.preventCaptionOverlap;
+        $clone,
+        captionH = false;
 
       $caption.toggleClass("fancybox-caption--separate", preventOverlap);
 
       if (preventOverlap && caption && caption.length) {
         if (current.pos !== self.currPos) {
-          $caption = $caption
-            .clone()
-            .empty()
-            .appendTo($caption.parent());
+          $clone = $caption.clone().appendTo($caption.parent());
 
-          $caption.html(caption);
+          $clone
+            .children()
+            .eq(0)
+            .empty()
+            .html(caption);
 
-          captionH = $caption.outerHeight(true);
+          captionH = $clone.outerHeight(true);
 
-          $caption.empty().remove();
+          $clone.empty().remove();
         } else if (self.$caption) {
           captionH = self.$caption.outerHeight(true);
         }
@@ -2963,6 +2965,8 @@
           .children()
           .eq(0)
           .html(caption);
+      } else {
+        self.$caption = null;
       }
 
       if (!self.hasHiddenControls && !self.isIdle) {
@@ -3046,7 +3050,7 @@
   });
 
   $.fancybox = {
-    version: "3.5.4",
+    version: "3.5.5",
     defaults: defaults,
 
     // Get current instance and execute a command.

diff --git a/dist/jquery.fancybox.min.js b/dist/jquery.fancybox.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@fancyapps/fancybox",
   "description": "Touch enabled, responsive and fully customizable jQuery lightbox script",
-  "version": "3.5.4",
+  "version": "3.5.5",
   "homepage": "https://fancyapps.com/fancybox/3/",
   "main": "dist/jquery.fancybox.js",
   "style": "dist/jquery.fancybox.css",

diff --git a/src/js/core.js b/src/js/core.js
@@ -2293,24 +2293,26 @@
       var self = this,
         current = slide || self.current,
         caption = current.opts.caption,
+        preventOverlap = current.opts.preventCaptionOverlap,
         $caption = self.$refs.caption,
-        captionH = false,
-        preventOverlap = current.opts.preventCaptionOverlap;
+        $clone,
+        captionH = false;
 
       $caption.toggleClass("fancybox-caption--separate", preventOverlap);
 
       if (preventOverlap && caption && caption.length) {
         if (current.pos !== self.currPos) {
-          $caption = $caption
-            .clone()
-            .empty()
-            .appendTo($caption.parent());
+          $clone = $caption.clone().appendTo($caption.parent());
 
-          $caption.html(caption);
+          $clone
+            .children()
+            .eq(0)
+            .empty()
+            .html(caption);
 
-          captionH = $caption.outerHeight(true);
+          captionH = $clone.outerHeight(true);
 
-          $caption.empty().remove();
+          $clone.empty().remove();
         } else if (self.$caption) {
           captionH = self.$caption.outerHeight(true);
         }
@@ -2953,6 +2955,8 @@
           .children()
           .eq(0)
           .html(caption);
+      } else {
+        self.$caption = null;
       }
 
       if (!self.hasHiddenControls && !self.isIdle) {