Browse Source

Update to release v5.5.0 fixes #1694

Kartik Visweswaran 2 years ago
parent
commit
c233160bef
3 changed files with 11 additions and 6 deletions
  1. 3 1
      CHANGE.md
  2. 8 5
      js/fileinput.js
  3. 0 0
      js/fileinput.min.js

+ 3 - 1
CHANGE.md

@@ -5,7 +5,7 @@ Change Log: `bootstrap-fileinput`
 
 **Major Release: BC Breaking**
 
-**Date**: 28-Jun-2022
+**Date**: 29-Jun-2022
 
 - (enh #1800): Styling enhancements for thumbnail content and rotatable images.
 - (enh #1799): Correct translations containing `{maxSize}, {minSize}, {size}`.
@@ -47,6 +47,8 @@ $input.on('fileuploaderror', function(event, data) {
   // $input.fileinput('showUserError', userMessage); 
 });
 ```
+- (enh #1694): Thumbnail of images only but detailed preview/iconic view of all other files.
+    - New property `alwaysPreviewFileExtensions` - setup as an array list of extensions whose content will always be shown in preview (irrespective of `preferIconPreview` or `previewFileIconSettings` which will be used to control icon preview for configured types).
 
 ## version 5.2.8
 

+ 8 - 5
js/fileinput.js

@@ -4369,12 +4369,13 @@
             zoomData
         ) {
             var self = this, caption = self.slug(fname), prevContent, zoomContent = '', styleAttribs = '',
-                filename = fnameUpdated || fname,
+                filename = fnameUpdated || fname, isIconic, ext = filename.split('.').pop().toLowerCase(),
                 screenW = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth,
                 config, title = caption, alt = caption, typeCss = 'type-default', getContent, addFrameCss,
                 footer = foot || self._renderFileFooter(cat, caption, size, 'auto', isError), isRotatable,
-                forcePrevIcon = self.preferIconicPreview, forceZoomIcon = self.preferIconicZoomPreview,
-                newCat = forcePrevIcon ? 'other' : cat, ext = filename.split('.').pop().toLowerCase();
+                alwaysPreview = $.inArray(ext, self.alwaysPreviewFileExtensions) !== -1,
+                forcePrevIcon = self.preferIconicPreview && !alwaysPreview,
+                forceZoomIcon = self.preferIconicZoomPreview && !alwaysPreview, newCat = forcePrevIcon ? 'other' : cat;
             config = screenW < 400 ? (self.previewSettingsSmall[newCat] || self.defaults.previewSettingsSmall[newCat]) :
                 (self.previewSettings[newCat] || self.defaults.previewSettings[newCat]);
             if (config) {
@@ -4448,7 +4449,8 @@
             }
             addFrameCss = 'kv-preview-thumb';
             if (isRotatable) {
-                addFrameCss += ' rotatable' + (forcePrevIcon || self.hideThumbnailContent ? ' hide-rotate' : '');
+                isIconic = forcePrevIcon || self.hideThumbnailContent || !!self.previewFileIconSettings[ext];
+                addFrameCss += ' rotatable' + (isIconic ? ' hide-rotate' : '');
             }
             prevContent = getContent((forcePrevIcon ? 'other' : cat), data, false, addFrameCss, zoomData);
             return prevContent.setTokens({zoomCache: zoomContent});
@@ -6340,6 +6342,7 @@
         previewContentTemplates: {},
         preferIconicPreview: false,
         preferIconicZoomPreview: false,
+        alwaysPreviewFileExtensions: [],
         rotatableFileExtensions: ['jpg', 'jpeg', 'png', 'gif'],
         allowedFileTypes: null,
         allowedFileExtensions: null,
@@ -6397,7 +6400,7 @@
             maxThreads: 4,
             maxRetries: 3,
             showErrorLog: true,
-            retainErrorHistory: true, // display complete error history always unless user explicitly resets upload
+            retainErrorHistory: false, // when set to true, display complete error history always unless user explicitly resets upload
             skipErrorsAndProceed: false // when set to true, files with errors will be skipped and upload will continue with other files
         },
         uploadExtraData: {},

File diff suppressed because it is too large
+ 0 - 0
js/fileinput.min.js


Some files were not shown because too many files changed in this diff