|
4369 | 4369 | zoomData |
4370 | 4370 | ) { |
4371 | 4371 | var self = this, caption = self.slug(fname), prevContent, zoomContent = '', styleAttribs = '', |
4372 | | - filename = fnameUpdated || fname, |
| 4372 | + filename = fnameUpdated || fname, isIconic, ext = filename.split('.').pop().toLowerCase(), |
4373 | 4373 | screenW = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth, |
4374 | 4374 | config, title = caption, alt = caption, typeCss = 'type-default', getContent, addFrameCss, |
4375 | 4375 | footer = foot || self._renderFileFooter(cat, caption, size, 'auto', isError), isRotatable, |
4376 | | - forcePrevIcon = self.preferIconicPreview, forceZoomIcon = self.preferIconicZoomPreview, |
4377 | | - newCat = forcePrevIcon ? 'other' : cat, ext = filename.split('.').pop().toLowerCase(); |
| 4376 | + alwaysPreview = $.inArray(ext, self.alwaysPreviewFileExtensions) !== -1, |
| 4377 | + forcePrevIcon = self.preferIconicPreview && !alwaysPreview, |
| 4378 | + forceZoomIcon = self.preferIconicZoomPreview && !alwaysPreview, newCat = forcePrevIcon ? 'other' : cat; |
4378 | 4379 | config = screenW < 400 ? (self.previewSettingsSmall[newCat] || self.defaults.previewSettingsSmall[newCat]) : |
4379 | 4380 | (self.previewSettings[newCat] || self.defaults.previewSettings[newCat]); |
4380 | 4381 | if (config) { |
|
4448 | 4449 | } |
4449 | 4450 | addFrameCss = 'kv-preview-thumb'; |
4450 | 4451 | if (isRotatable) { |
4451 | | - addFrameCss += ' rotatable' + (forcePrevIcon || self.hideThumbnailContent ? ' hide-rotate' : ''); |
| 4452 | + isIconic = forcePrevIcon || self.hideThumbnailContent || !!self.previewFileIconSettings[ext]; |
| 4453 | + addFrameCss += ' rotatable' + (isIconic ? ' hide-rotate' : ''); |
4452 | 4454 | } |
4453 | 4455 | prevContent = getContent((forcePrevIcon ? 'other' : cat), data, false, addFrameCss, zoomData); |
4454 | 4456 | return prevContent.setTokens({zoomCache: zoomContent}); |
|
6340 | 6342 | previewContentTemplates: {}, |
6341 | 6343 | preferIconicPreview: false, |
6342 | 6344 | preferIconicZoomPreview: false, |
| 6345 | + alwaysPreviewFileExtensions: [], |
6343 | 6346 | rotatableFileExtensions: ['jpg', 'jpeg', 'png', 'gif'], |
6344 | 6347 | allowedFileTypes: null, |
6345 | 6348 | allowedFileExtensions: null, |
|
6397 | 6400 | maxThreads: 4, |
6398 | 6401 | maxRetries: 3, |
6399 | 6402 | showErrorLog: true, |
6400 | | - retainErrorHistory: true, // display complete error history always unless user explicitly resets upload |
| 6403 | + retainErrorHistory: false, // when set to true, display complete error history always unless user explicitly resets upload |
6401 | 6404 | skipErrorsAndProceed: false // when set to true, files with errors will be skipped and upload will continue with other files |
6402 | 6405 | }, |
6403 | 6406 | uploadExtraData: {}, |
|
0 commit comments