Merge pull request #249 from clq321/patch-3

Fix error message content display

CHANGE.md

@@ -10,6 +10,8 @@ version 4.1.9
 6. (enh #244): Add Serbian translations.
 7. (enh #245): Allow initial caption to be set without initial preview.
 8. (bug #247): Correct mime types validation.
+9. (enh #248): keep chinese characters in file caption.
+10. (bug #249): Fix error message content display.
 
 version 4.1.8
 =============

js/fileinput.js

@@ -1905,14 +1905,14 @@
         },
         setCaption: function (content, isError) {
             var self = this, err = isError || false, title, out;
-            if (isEmpty(content) || self.$caption.length === 0) {
-                return;
-            }
             if (err) {
                 title = $('<div>' + self.msgValidationError + '</div>').text();
                 out = '<span class="' + self.msgValidationErrorClass + '">' +
                 self.msgValidationErrorIcon + title + '</span>';
             } else {
+                if (isEmpty(content) || self.$caption.length === 0) {
+                    return;
+                }
                 title = $('<div>' + content + '</div>').text();
                 out = self.getLayoutTemplate('icon') + title;
             }
@@ -2134,4 +2134,4 @@
             $input.fileinput();
         }
     });
-})(window.jQuery);
+})(window.jQuery);