8 năm trước cách đây · 6014bde57d
--- a/CHANGE.md
+++ b/CHANGE.md
@@ -1,7 +1,7 @@
 
				 Change Log: `bootstrap-fileinput`

			
 
				 =================================

			
 
				 

			
 
				-## version 4.3.8

			
 
				+## version 4.3.8 (_under development_)

			
 
				 

			
 
				 **Date:** 13-Feb-2017

			
 
				 

			
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ View the [plugin documentation](http://plugins.krajee.com/file-input) and [plugi
 
				 3. Most modern browsers supporting HTML5 (inputs and FileReader API) including CSS3 & JQuery. For Internet Explorer, one must use IE versions 10 and above. IE9 and below will work as a normal file input, and will not support multiple file selection or the HTML 5 FileReader API.

			
 
				 4. With release 4.0, AJAX uploads are supported. AJAX uploads require that the browser support HTML5 FormData and XHR2 (XMLHttpRequest 2). Most modern browsers support FormData and XHR2. The plugin will automatically degrade to normal form based submission for browsers not supporting AJAX uploads

			
 
				 

			
 
				-> NOTE: The latest version of the plugin is v4.3.7. Refer the [CHANGE LOG](https://github.com/kartik-v/bootstrap-fileinput/blob/master/CHANGE.md) for details. 

			
 
				+> NOTE: The latest version of the plugin is v4.3.8 (under development). Refer the [CHANGE LOG](https://github.com/kartik-v/bootstrap-fileinput/blob/master/CHANGE.md) for details. 

			
 
				 

			
 
				 > NOTE: You can use the [sass branch](https://github.com/kartik-v/bootstrap-fileinput/tree/sass) for installation using `bootstrap-sass` dependency.

			
 
				 The [master branch](https://github.com/kartik-v/bootstrap-fileinput/tree/master) can be used for installation using plain `bootstrap` dependency.

			
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 
				 {

			
 
				     "name": "bootstrap-fileinput",

			
 
				-    "version": "4.3.7",

			
 
				+    "version": "4.3.8",

			
 
				     "homepage": "https://github.com/kartik-v/bootstrap-fileinput",

			
 
				     "authors": [

			
 
				         "Kartik Visweswaran <[email protected]>"

			
--- a/css/fileinput.css
+++ b/css/fileinput.css
@@ -1,5 +1,5 @@
 
				 /*!

			
 
				- * bootstrap-fileinput v4.3.7

			
 
				+ * bootstrap-fileinput v4.3.8

			
 
				  * http://plugins.krajee.com/file-input

			
 
				  *

			
 
				  * Krajee default styling for bootstrap-fileinput.

			
--- a/css/fileinput.min.css
+++ b/css/fileinput.min.css
@@ -1,5 +1,5 @@
 
				 /*!

			
 
				- * bootstrap-fileinput v4.3.7

			
 
				+ * bootstrap-fileinput v4.3.8

			
 
				  * http://plugins.krajee.com/file-input

			
 
				  *

			
 
				  * Krajee default styling for bootstrap-fileinput.

			
--- a/examples/index.html
+++ b/examples/index.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>

			
 
				-<!-- release v4.3.7, copyright 2014 - 2017 Kartik Visweswaran -->

			
 
				+<!-- release v4.3.8, copyright 2014 - 2017 Kartik Visweswaran -->

			
 
				 <!--suppress JSUnresolvedLibraryURL -->

			
 
				 <html lang="en">

			
 
				 <head>

			
--- a/js/fileinput.js
+++ b/js/fileinput.js
@@ -544,7 +544,7 @@
 
				                     }
			
 
				                     return;
			
 
				                 }
			
 
				-                self[key] = $.extend(true, setting, self[key]);
			
 
				+                self[key] = $.extend(true, {}, setting, self[key]);
			
 
				             });
			
 
				             self._initPreviewTemplates();
			
 
				         },
			
@@ -2193,8 +2193,8 @@
 
				         },
			
 
				         _generatePreviewTemplate: function (cat, data, fname, ftype, previewId, isError, size, frameClass, foot, ind, templ) {
			
 
				             var self = this, caption = self.slug(fname), prevContent, zoomContent = '',
			
 
				-                config = self.previewSettings[cat], w = config && config.width ? config.width : '',
			
 
				-                h = config && config.height ? config.height : '',
			
 
				+                config = self.previewSettings[cat] || self.defaults.previewSettings[cat],
			
 
				+                w = config && config.width ? config.width : '', h = config && config.height ? config.height : '',
			
 
				                 footer = foot || self._renderFileFooter(caption, size, ($h.isEmpty(w) ? 'auto' : w), isError),
			
 
				                 hasIconSetting = self._getPreviewIcon(fname),
			
 
				                 forcePrevIcon = hasIconSetting && self.preferIconicPreview,
			
--- a/js/fileinput.min.js
+++ b/js/fileinput.min.js
--- a/nuget/Package.nuspec
+++ b/nuget/Package.nuspec
@@ -3,7 +3,7 @@
 
				   <metadata>

			
 
				     <id>bootstrap-fileinput</id>

			
 
				 	<title>bootstrap-fileinput</title>

			
 
				-    <version>4.3.7</version>

			
 
				+    <version>4.3.8</version>

			
 
				     <authors>Kartik Visweswaran</authors>

			
 
				     <owners>Kartik Visweswaran</owners>

			
 
				     <licenseUrl>https://github.com/kartik-v/bootstrap-fileinput/blob/master/LICENSE.md</licenseUrl>

			
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 
				 {
			
 
				     "name": "bootstrap-fileinput",
			
 
				-    "version": "4.3.7",
			
 
				+    "version": "4.3.8",
			
 
				     "homepage": "https://github.com/kartik-v/bootstrap-fileinput",
			
 
				     "authors": [
			
 
				         "Kartik Visweswaran <[email protected]>"
			
--- a/sass/fileinput.scss
+++ b/sass/fileinput.scss
@@ -1,5 +1,5 @@
 
				 /*!
			
 
				- * bootstrap-fileinput v4.3.7
			
 
				+ * bootstrap-fileinput v4.3.8
			
 
				  * http://plugins.krajee.com/file-input
			
 
				  *
			
 
				  * Author: Kartik Visweswaran
			
--- a/themes/explorer/theme.css
+++ b/themes/explorer/theme.css
@@ -1,5 +1,5 @@
 
				 /*!

			
 
				- * bootstrap-fileinput v4.3.7

			
 
				+ * bootstrap-fileinput v4.3.8

			
 
				  * http://plugins.krajee.com/file-input

			
 
				  *

			
 
				  * Krajee Explorer theme style for bootstrap-fileinput. Load this theme file after loading `fileinput.css`.

			
--- a/themes/explorer/theme.js
+++ b/themes/explorer/theme.js
@@ -1,5 +1,5 @@
 
				 /*!

			
 
				- * bootstrap-fileinput v4.3.7

			
 
				+ * bootstrap-fileinput v4.3.8

			
 
				  * http://plugins.krajee.com/file-input

			
 
				  *

			
 
				  * Krajee Explorer theme configuration for bootstrap-fileinput. Load this theme file after loading `fileinput.js`.

			
--- a/themes/fa/theme.js
+++ b/themes/fa/theme.js
@@ -1,5 +1,5 @@
 
				 /*!
			
 
				- * bootstrap-fileinput v4.3.7
			
 
				+ * bootstrap-fileinput v4.3.8
			
 
				  * http://plugins.krajee.com/file-input
			
 
				  *
			
 
				  * Font Awesome icon theme configuration for bootstrap-fileinput. Requires font awesome assets to be loaded.
			
--- a/themes/gly/theme.js
+++ b/themes/gly/theme.js
@@ -1,5 +1,5 @@
 
				 /*!
			
 
				- * bootstrap-fileinput v4.3.7
			
 
				+ * bootstrap-fileinput v4.3.8
			
 
				  * http://plugins.krajee.com/file-input
			
 
				  *
			
 
				  * Glyphicon (default) theme configuration for bootstrap-fileinput.