Jelajahi Sumber

Fix #1474: Hide upload icon for file validation errors

Kartik Visweswaran 5 tahun lalu
induk
melakukan
4308b87cc1
3 mengubah file dengan 8 tambahan dan 6 penghapusan
  1. 1 0
      CHANGE.md
  2. 7 6
      js/fileinput.js
  3. 0 0
      js/fileinput.min.js

+ 1 - 0
CHANGE.md

@@ -6,6 +6,7 @@ Change Log: `bootstrap-fileinput`
 **Date:** _under development_
 **Date:** _under development_
 
 
 - (enh #1475): Prevent invalid thumb validation when `showPreview` is `false`.
 - (enh #1475): Prevent invalid thumb validation when `showPreview` is `false`.
+- (enh #1474): Hide upload icon for file validation errors.
 - (enh #1471): Improve pt-PT and pt-BR translations.
 - (enh #1471): Improve pt-PT and pt-BR translations.
 - (enh #1468): Update Uzbek Translations.
 - (enh #1468): Update Uzbek Translations.
 - (enh #1467): Update Czekh Translations.
 - (enh #1467): Update Czekh Translations.

+ 7 - 6
js/fileinput.js

@@ -4763,14 +4763,15 @@
                 previewInitId = self.previewInitId, numFiles = files.length, settings = self.fileTypeSettings,
                 previewInitId = self.previewInitId, numFiles = files.length, settings = self.fileTypeSettings,
                 readFile, fileTypes = self.allowedFileTypes, typLen = fileTypes ? fileTypes.length : 0,
                 readFile, fileTypes = self.allowedFileTypes, typLen = fileTypes ? fileTypes.length : 0,
                 fileExt = self.allowedFileExtensions, strExt = $h.isEmpty(fileExt) ? '' : fileExt.join(', '),
                 fileExt = self.allowedFileExtensions, strExt = $h.isEmpty(fileExt) ? '' : fileExt.join(', '),
-                throwError = function (msg, file, previewId, index, fileId, skipThumbEmbed) {
+                throwError = function (msg, file, previewId, index, fileId, removeThumb) {
                     var p1 = $.extend(true, {}, self._getOutData(null, {}, {}, files),
                     var p1 = $.extend(true, {}, self._getOutData(null, {}, {}, files),
-                        {id: previewId, index: index, fileId: fileId}), $thumb = self._getFrame(previewId, true),
+                        {id: previewId, index: index, fileId: fileId}), $thumb = '',
                         p2 = {id: previewId, index: index, fileId: fileId, file: file, files: files};
                         p2 = {id: previewId, index: index, fileId: fileId, file: file, files: files};
-                    skipThumbEmbed = skipThumbEmbed || self.removeFromPreviewOnError;
-                    if (!skipThumbEmbed) {
+                    removeThumb = removeThumb || self.removeFromPreviewOnError;
+                    if (!removeThumb) {
                         self._previewDefault(file, true);
                         self._previewDefault(file, true);
                     }
                     }
+                    $thumb = self._getFrame(previewId, true);
                     if (self.isAjaxUpload) {
                     if (self.isAjaxUpload) {
                         setTimeout(function () {
                         setTimeout(function () {
                             readFile(index + 1);
                             readFile(index + 1);
@@ -4779,10 +4780,10 @@
                         self.unlock();
                         self.unlock();
                         numFiles = 0;
                         numFiles = 0;
                     }
                     }
-                    if (!skipThumbEmbed) {
-                        self._initFileActions();
+                    if (removeThumb && $thumb.length) {
                         $thumb.remove();
                         $thumb.remove();
                     } else {
                     } else {
+                        self._initFileActions();
                         $thumb.find('.kv-file-upload').remove();
                         $thumb.find('.kv-file-upload').remove();
                     }
                     }
                     self.isError = self.isAjaxUpload ? self._showFileError(msg, p1) : self._showError(msg, p2);
                     self.isError = self.isAjaxUpload ? self._showFileError(msg, p1) : self._showError(msg, p2);

File diff ditekan karena terlalu besar
+ 0 - 0
js/fileinput.min.js


Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini