|
@@ -583,8 +583,7 @@
|
|
self.$previewContainer = $h.getElement(options, 'elPreviewContainer', $cont.find('.file-preview'));
|
|
self.$previewContainer = $h.getElement(options, 'elPreviewContainer', $cont.find('.file-preview'));
|
|
self.$preview = $h.getElement(options, 'elPreviewImage', $cont.find('.file-preview-thumbnails'));
|
|
self.$preview = $h.getElement(options, 'elPreviewImage', $cont.find('.file-preview-thumbnails'));
|
|
self.$previewStatus = $h.getElement(options, 'elPreviewStatus', $cont.find('.file-preview-status'));
|
|
self.$previewStatus = $h.getElement(options, 'elPreviewStatus', $cont.find('.file-preview-status'));
|
|
- self.$errorContainer = $h.getElement(options, 'elErrorContainer',
|
|
|
|
- self.$previewContainer.find('.kv-fileinput-error'));
|
|
|
|
|
|
+ self.$errorContainer = $h.getElement(options, 'elErrorContainer', self.$previewContainer.find('.kv-fileinput-error'));
|
|
self._validateDisabled();
|
|
self._validateDisabled();
|
|
if (!$h.isEmpty(self.msgErrorClass)) {
|
|
if (!$h.isEmpty(self.msgErrorClass)) {
|
|
$h.addCss(self.$errorContainer, self.msgErrorClass);
|
|
$h.addCss(self.$errorContainer, self.msgErrorClass);
|
|
@@ -1138,7 +1137,12 @@
|
|
if (msg && $error.length) {
|
|
if (msg && $error.length) {
|
|
$error.html(self.errorCloseButton + msg);
|
|
$error.html(self.errorCloseButton + msg);
|
|
self._handler($error.find('.kv-error-close'), 'click', function () {
|
|
self._handler($error.find('.kv-error-close'), 'click', function () {
|
|
- $error.fadeOut('slow');
|
|
|
|
|
|
+ setTimeout(function() {
|
|
|
|
+ if (self.showPreview && !self.getFrames().length) {
|
|
|
|
+ self.clear();
|
|
|
|
+ }
|
|
|
|
+ $error.fadeOut('slow');
|
|
|
|
+ }, 10);
|
|
});
|
|
});
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -1375,7 +1379,8 @@
|
|
$zone.attr('tabindex', -1);
|
|
$zone.attr('tabindex', -1);
|
|
self._handler($zone, 'click', function (e) {
|
|
self._handler($zone, 'click', function (e) {
|
|
var $tar = $(e.target);
|
|
var $tar = $(e.target);
|
|
- if (!$tar.parents('.file-preview-thumbnails').length || $tar.parents('.file-default-preview').length) {
|
|
|
|
|
|
+ if (!$zone.find('.kv-fileinput-error:visible').length &&
|
|
|
|
+ (!$tar.parents('.file-preview-thumbnails').length || $tar.parents('.file-default-preview').length)) {
|
|
self.$element.trigger('click');
|
|
self.$element.trigger('click');
|
|
$zone.blur();
|
|
$zone.blur();
|
|
}
|
|
}
|