Skip to content

Commit e73e54e

Browse files
committed
Updates to release v4.2.4
1 parent 385c73e commit e73e54e

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

js/fileinput.js

+10-4
Original file line numberDiff line numberDiff line change
@@ -1153,6 +1153,9 @@
11531153
self.getThumbs().each(function () {
11541154
self.clearObjects($(this));
11551155
});
1156+
if (self.isUploadable) {
1157+
previewCache.data[self.id] = {};
1158+
}
11561159
self.$preview.html('');
11571160
cap = (!self.overwriteInitial && self.initialCaption.length > 0) ? self.initialCaption : '';
11581161
self.setCaption(cap);
@@ -1188,7 +1191,8 @@
11881191
self.setEllipsis();
11891192
self.$container.find('.fileinput-filename').text('');
11901193
self.raise('filereset');
1191-
if (self.initialPreview.length > 0) {
1194+
addCss(self.$container, 'file-input-new');
1195+
if (self.$preview.find('.file-preview-frame').length || self.isUploadable && self.dropZoneEnabled) {
11921196
self.$container.removeClass('file-input-new');
11931197
}
11941198
self.setFileDropZoneTitle();
@@ -1201,7 +1205,7 @@
12011205
self.raise('filedisabled');
12021206
self.$element.attr('disabled', 'disabled');
12031207
self.$container.find(".kv-fileinput-caption").addClass("file-caption-disabled");
1204-
self.$container.find(".btn-file, .fileinput-remove, .kv-fileinput-upload").attr("disabled", true);
1208+
self.$container.find(".btn-file, .fileinput-remove, .kv-fileinput-upload, .file-preview-frame button").attr("disabled", true);
12051209
self.initDragDrop();
12061210
},
12071211
enable: function () {
@@ -1210,7 +1214,7 @@
12101214
self.raise('fileenabled');
12111215
self.$element.removeAttr('disabled');
12121216
self.$container.find(".kv-fileinput-caption").removeClass("file-caption-disabled");
1213-
self.$container.find(".btn-file, .fileinput-remove, .kv-fileinput-upload").removeAttr("disabled");
1217+
self.$container.find(".btn-file, .fileinput-remove, .kv-fileinput-upload, .file-preview-frame button").removeAttr("disabled");
12141218
self.initDragDrop();
12151219
},
12161220
getThumbs: function (css) {
@@ -1620,6 +1624,7 @@
16201624
}
16211625
$error.fadeIn(800);
16221626
self.raise(ev, [params]);
1627+
self.$container.removeClass('file-input-new');
16231628
addCss(self.$container, 'has-error');
16241629
return true;
16251630
},
@@ -1633,6 +1638,7 @@
16331638
if (!self.isUploadable) {
16341639
self.clearFileInput();
16351640
}
1641+
self.$container.removeClass('file-input-new');
16361642
addCss(self.$container, 'has-error');
16371643
self.$btnUpload.attr('disabled', true);
16381644
return true;
@@ -1869,7 +1875,7 @@
18691875
}
18701876

18711877
readFile(0);
1872-
//self.updateFileDetails(numFiles, false);
1878+
self.updateFileDetails(numFiles, false);
18731879
},
18741880
updateFileDetails: function (numFiles) {
18751881
var self = this, $el = self.$element, fileStack = self.getFileStack(),

0 commit comments

Comments
 (0)