瀏覽代碼

Fix #1012: Better formatting of ajax errors display

Kartik Visweswaran 7 年之前
父節點
當前提交
190a9a66ce
共有 3 個文件被更改,包括 7 次插入8 次删除
  1. 2 1
      CHANGE.md
  2. 5 7
      js/fileinput.js
  3. 0 0
      js/fileinput.min.js

+ 2 - 1
CHANGE.md

@@ -5,9 +5,10 @@ Change Log: `bootstrap-fileinput`
 
 **Date:** 29-Jul-2017
 
+- (bug #1030): Correct image dimension validation to consider non JPEG images.
 - (enh #1015): Enhancement to RTL styling.
+- (enh #1012): Better formatting of ajax errors display.
 - (enh #1006): Update Farsi Translations.
-- (bug #1030): Correct image dimension validation to consider non JPEG images.
 
 ## version 4.4.2
 

+ 5 - 7
js/fileinput.js

@@ -1030,7 +1030,7 @@
         },
         _parseError: function (operation, jqXHR, errorThrown, fileName) {
             /** @namespace jqXHR.responseJSON */
-            var self = this, errMsg = $.trim(errorThrown + ''), dot = errMsg.slice(-1) === '.' ? '' : '.',
+            var self = this, errMsg = $.trim(errorThrown + ''), textPre 
                 text = jqXHR.responseJSON !== undefined && jqXHR.responseJSON.error !== undefined ?
                     jqXHR.responseJSON.error : jqXHR.responseText;
             if (self.cancelling && self.msgUploadAborted) {
@@ -1038,12 +1038,10 @@
             }
             if (self.showAjaxErrorDetails && text) {
                 text = $.trim(text.replace(/\n\s*\n/g, '\n'));
-                text = text.length > 0 ? '<pre>' + text + '</pre>' : '';
-                errMsg += dot + text;
-            } else {
-                errMsg += dot;
-            }
-            if (errMsg === dot) {
+                textPre = text.length ? '<pre>' + text + '</pre>' : '';
+                errMsg += errMsg ? textPre : text;
+            } 
+            if (!errMsg) {
                 errMsg = self.msgAjaxError.replace('{operation}', operation);
             }
             self.cancelling = false;

文件差異過大導致無法顯示
+ 0 - 0
js/fileinput.min.js


部分文件因文件數量過多而無法顯示