Fixed #191 (#192)

marekdedic · Mar 28, 2019 · 13a6bbc · 13a6bbc
1 parent 9282377
commit 13a6bbc
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 4 deletions.
diff --git a/dist/imagelightbox.min.css b/dist/imagelightbox.min.css
diff --git a/dist/imagelightbox.min.js b/dist/imagelightbox.min.js
diff --git a/docs/javascripts/imagelightbox.js b/docs/javascripts/imagelightbox.js
@@ -324,10 +324,13 @@
                 });
             },
             captionReset = function () {
+                $captionObject.css('opacity', '0');
                 $captionObject.html('&nbsp;');
                 if ($(target).data('ilb2-caption')) {
+                    $captionObject.css('opacity', '1');
                     $captionObject.html($(target).data('ilb2-caption'));
-                } else if ($(target).find('img').length > 0) {
+                } else if ($(target).find('img').attr('alt')) {
+                    $captionObject.css('opacity', '1');
                     $captionObject.html($(target).find('img').attr('alt'));
                 }
             },

diff --git a/docs/stylesheets/imagelightbox.css b/docs/stylesheets/imagelightbox.css
@@ -118,6 +118,7 @@
     right: 0;
     bottom: 0;
     padding: 0.625em; /* 10 */
+    transition: opacity .25s ease;
 }
 
 /* WITH NAVIGATION */

diff --git a/src/imagelightbox.css b/src/imagelightbox.css
@@ -118,6 +118,7 @@
     right: 0;
     bottom: 0;
     padding: 0.625em; /* 10 */
+    transition: opacity .25s ease;
 }
 
 /* WITH NAVIGATION */

diff --git a/src/imagelightbox.js b/src/imagelightbox.js
@@ -324,10 +324,13 @@
                 });
             },
             captionReset = function () {
+                $captionObject.css('opacity', '0');
                 $captionObject.html('&nbsp;');
                 if ($(target).data('ilb2-caption')) {
+                    $captionObject.css('opacity', '1');
                     $captionObject.html($(target).data('ilb2-caption'));
-                } else if ($(target).find('img').length > 0) {
+                } else if ($(target).find('img').attr('alt')) {
+                    $captionObject.css('opacity', '1');
                     $captionObject.html($(target).find('img').attr('alt'));
                 }
             },