fix: fix caption setting issue

nzbin · Dec 24, 2019 · dc216be · dc216be
1 parent 0c4cac0
commit dc216be
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 18 deletions.
diff --git a/dist/jquery.magnify.js b/dist/jquery.magnify.js
@@ -1004,9 +1004,7 @@ Magnify.prototype = {
     });
   },
   setImgTitle: function (url) {
-    var title = this.groupData[this.groupIndex].title
-      ? this.groupData[this.groupIndex].title
-      : getImageNameFromUrl(url);
+    var title = this.groupData[this.groupIndex].caption || getImageNameFromUrl(url);
 
     this.$title.html(title);
   },
@@ -2041,10 +2039,7 @@ var resizable = function (modal, stage, image, minWidth, minHeight) {
     PUBLIC_VARS['isResizing'] = false;
 
     // Remove resizable cursor
-    $('html,body,.magnify-modal,.magnify-stage,.magnify-button').css(
-      'cursor',
-      ''
-    );
+    $('html, body, .magnify-modal, .magnify-stage, .magnify-button').css('cursor', '');
 
     // Update image initial data
     var scale = self.getImageScaleToStage($(stage).width(), $(stage).height());

diff --git a/dist/jquery.magnify.min.js b/dist/jquery.magnify.min.js
diff --git a/docs/js/jquery.magnify.js b/docs/js/jquery.magnify.js
@@ -1004,9 +1004,7 @@ Magnify.prototype = {
     });
   },
   setImgTitle: function (url) {
-    var title = this.groupData[this.groupIndex].title
-      ? this.groupData[this.groupIndex].title
-      : getImageNameFromUrl(url);
+    var title = this.groupData[this.groupIndex].caption || getImageNameFromUrl(url);
 
     this.$title.html(title);
   },
@@ -2041,10 +2039,7 @@ var resizable = function (modal, stage, image, minWidth, minHeight) {
     PUBLIC_VARS['isResizing'] = false;
 
     // Remove resizable cursor
-    $('html,body,.magnify-modal,.magnify-stage,.magnify-button').css(
-      'cursor',
-      ''
-    );
+    $('html, body, .magnify-modal, .magnify-stage, .magnify-button').css('cursor', '');
 
     // Update image initial data
     var scale = self.getImageScaleToStage($(stage).width(), $(stage).height());

diff --git a/src/js/core.js b/src/js/core.js
@@ -817,9 +817,7 @@ Magnify.prototype = {
     });
   },
   setImgTitle: function (url) {
-    var title = this.groupData[this.groupIndex].title
-      ? this.groupData[this.groupIndex].title
-      : getImageNameFromUrl(url);
+    var title = this.groupData[this.groupIndex].caption || getImageNameFromUrl(url);
 
     this.$title.html(title);
   },