Pārlūkot izejas kodu

Fix #870: Correct config.width parsing

Kartik Visweswaran 8 gadi atpakaļ
vecāks
revīzija
c1d1e01f0a
3 mainītis faili ar 7 papildinājumiem un 1 dzēšanām
  1. 6 0
      CHANGE.md
  2. 1 1
      js/fileinput.js
  3. 0 0
      js/fileinput.min.js

+ 6 - 0
CHANGE.md

@@ -1,6 +1,12 @@
 Change Log: `bootstrap-fileinput`
 Change Log: `bootstrap-fileinput`
 =================================
 =================================
 
 
+## version 4.3.8
+
+**Date:** 13-Feb-2017
+
+1. (bug #870): Correct config.width parsing.
+
 ## version 4.3.7
 ## version 4.3.7
 
 
 **Date:** 11-Feb-2017
 **Date:** 11-Feb-2017

+ 1 - 1
js/fileinput.js

@@ -2195,7 +2195,7 @@
             var self = this, caption = self.slug(fname), prevContent, zoomContent = '',
             var self = this, caption = self.slug(fname), prevContent, zoomContent = '',
                 config = self.previewSettings[cat], w = config && config.width ? config.width : '',
                 config = self.previewSettings[cat], w = config && config.width ? config.width : '',
                 h = config && config.height ? config.height : '',
                 h = config && config.height ? config.height : '',
-                footer = foot || self._renderFileFooter(caption, size, config.width, isError),
+                footer = foot || self._renderFileFooter(caption, size, ($h.isEmpty(w) ? 'auto' : w), isError),
                 hasIconSetting = self._getPreviewIcon(fname),
                 hasIconSetting = self._getPreviewIcon(fname),
                 forcePrevIcon = hasIconSetting && self.preferIconicPreview,
                 forcePrevIcon = hasIconSetting && self.preferIconicPreview,
                 forceZoomIcon = hasIconSetting && self.preferIconicZoomPreview,
                 forceZoomIcon = hasIconSetting && self.preferIconicZoomPreview,

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
js/fileinput.min.js


Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels