浏览代码

Fix #1390: Correct remove button display validation set via `fileActionSettings`

Kartik Visweswaran 6 年之前
父节点
当前提交
226d7e0b95
共有 3 个文件被更改,包括 3 次插入2 次删除
  1. 1 0
      CHANGE.md
  2. 2 2
      js/fileinput.js
  3. 0 0
      js/fileinput.min.js

+ 1 - 0
CHANGE.md

@@ -5,6 +5,7 @@ Change Log: `bootstrap-fileinput`
 
 
 **Date:** _under development_
 **Date:** _under development_
 
 
+- (bug #1390): Correct remove button display validation set via `fileActionSettings`.
 - (bug #1385): Correct resize image error.
 - (bug #1385): Correct resize image error.
 - (bug #1383): Validate for undefined zoom data.
 - (bug #1383): Validate for undefined zoom data.
     
     

+ 2 - 2
js/fileinput.js

@@ -4443,7 +4443,7 @@
                 showDwn = showDwn(cfg);
                 showDwn = showDwn(cfg);
             }
             }
             if (typeof showDel === 'function') {
             if (typeof showDel === 'function') {
-                showDwn = showDwn(cfg);
+                showDel = showDel(cfg);
             }
             }
             if (typeof showZoom === 'function') {
             if (typeof showZoom === 'function') {
                 showZoom = showZoom(cfg);
                 showZoom = showZoom(cfg);
@@ -4451,7 +4451,7 @@
             if (typeof showDrag === 'function') {
             if (typeof showDrag === 'function') {
                 showDrag = showDrag(cfg);
                 showDrag = showDrag(cfg);
             }
             }
-            if (!showUpl && !showDwn && !showDwn && !showZoom && !showDrag) {
+            if (!showUpl && !showDwn && !showDel && !showZoom && !showDrag) {
                 return '';
                 return '';
             }
             }
             var self = this, vUrl = url === false ? '' : ' data-url="' + url + '"',
             var self = this, vUrl = url === false ? '' : ' data-url="' + url + '"',

文件差异内容过多而无法显示
+ 0 - 0
js/fileinput.min.js


部分文件因为文件数量过多而无法显示