Inicio Explorar Axuda
Iniciar sesión
hugh
/
bootstrap-fileinput
1
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

Updates to release v4.3.8

Kartik Visweswaran %!s(int64=8) %!d(string=hai) anos
pai
c1d1e01f0a
achega
6014bde57d
Modificáronse 15 ficheiros con 16 adicións e 16 borrados
Unificar vista Mostrar estatísticas de Diff
  1. 1 1
      CHANGE.md
  2. 1 1
      README.md
  3. 1 1
      bower.json
  4. 1 1
      css/fileinput.css
  5. 1 1
      css/fileinput.min.css
  6. 1 1
      examples/index.html
  7. 3 3
      js/fileinput.js
  8. 0 0
      js/fileinput.min.js
  9. 1 1
      nuget/Package.nuspec
  10. 1 1
      package.json
  11. 1 1
      sass/fileinput.scss
  12. 1 1
      themes/explorer/theme.css
  13. 1 1
      themes/explorer/theme.js
  14. 1 1
      themes/fa/theme.js
  15. 1 1
      themes/gly/theme.js

+ 1 - 1
CHANGE.md
Ver ficheiro 

@@ -1,7 +1,7 @@
 
 Change Log: `bootstrap-fileinput`

 Change Log: `bootstrap-fileinput`

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

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

 

 

-## version 4.3.8

+## version 4.3.8 (_under development_)

 

 

 **Date:** 13-Feb-2017

 **Date:** 13-Feb-2017

+ 1 - 1
README.md
Ver ficheiro 

@@ -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.

 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

 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.

 > 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.

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

+ 1 - 1
bower.json
Ver ficheiro 

@@ -1,6 +1,6 @@
 
 {

 {

     "name": "bootstrap-fileinput",

     "name": "bootstrap-fileinput",

-    "version": "4.3.7",

+    "version": "4.3.8",

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

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

     "authors": [

     "authors": [

         "Kartik Visweswaran <[email protected]>"

         "Kartik Visweswaran <[email protected]>"

+ 1 - 1
css/fileinput.css
Ver ficheiro 

@@ -1,5 +1,5 @@
 
 /*!

 /*!

- * bootstrap-fileinput v4.3.7

+ * bootstrap-fileinput v4.3.8

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

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

  *

  *

  * Krajee default styling for bootstrap-fileinput.

  * Krajee default styling for bootstrap-fileinput.

+ 1 - 1
css/fileinput.min.css
Ver ficheiro 

@@ -1,5 +1,5 @@
 
 /*!

 /*!

- * bootstrap-fileinput v4.3.7

+ * bootstrap-fileinput v4.3.8

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

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

  *

  *

  * Krajee default styling for bootstrap-fileinput.

  * Krajee default styling for bootstrap-fileinput.

+ 1 - 1
examples/index.html
Ver ficheiro 

@@ -1,5 +1,5 @@
 
 <!DOCTYPE html>

 <!DOCTYPE html>

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

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

 <!--suppress JSUnresolvedLibraryURL -->

 <!--suppress JSUnresolvedLibraryURL -->

 <html lang="en">

 <html lang="en">

 <head>

 <head>

+ 3 - 3
js/fileinput.js
Ver ficheiro 

@@ -544,7 +544,7 @@
 
                     }
 
                     }
 
                     return;
 
                     return;
 
                 }
 
                 }
 
-                self[key] = $.extend(true, setting, self[key]);
 
+                self[key] = $.extend(true, {}, setting, self[key]);
 
             });
 
             });
 
             self._initPreviewTemplates();
 
             self._initPreviewTemplates();
 
         },
 
         },
 
@@ -2193,8 +2193,8 @@
 
         },
 
         },
 
         _generatePreviewTemplate: function (cat, data, fname, ftype, previewId, isError, size, frameClass, foot, ind, templ) {
 
         _generatePreviewTemplate: function (cat, data, fname, ftype, previewId, isError, size, frameClass, foot, ind, templ) {
 
             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 : '',
 
-                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),
 
                 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,

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
js/fileinput.min.js


+ 1 - 1
nuget/Package.nuspec
Ver ficheiro 

@@ -3,7 +3,7 @@
 
   <metadata>

   <metadata>

     <id>bootstrap-fileinput</id>

     <id>bootstrap-fileinput</id>

 	<title>bootstrap-fileinput</title>

 	<title>bootstrap-fileinput</title>

-    <version>4.3.7</version>

+    <version>4.3.8</version>

     <authors>Kartik Visweswaran</authors>

     <authors>Kartik Visweswaran</authors>

     <owners>Kartik Visweswaran</owners>

     <owners>Kartik Visweswaran</owners>

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

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

+ 1 - 1
package.json
Ver ficheiro 

@@ -1,6 +1,6 @@
 
 {
 
 {
 
     "name": "bootstrap-fileinput",
 
     "name": "bootstrap-fileinput",
 
-    "version": "4.3.7",
 
+    "version": "4.3.8",
 
     "homepage": "https://github.com/kartik-v/bootstrap-fileinput",
 
     "homepage": "https://github.com/kartik-v/bootstrap-fileinput",
 
     "authors": [
 
     "authors": [
 
         "Kartik Visweswaran <[email protected]>"
 
         "Kartik Visweswaran <[email protected]>"

+ 1 - 1
sass/fileinput.scss
Ver ficheiro 

@@ -1,5 +1,5 @@
 
 /*!
 
 /*!
 
- * bootstrap-fileinput v4.3.7
 
+ * bootstrap-fileinput v4.3.8
 
  * http://plugins.krajee.com/file-input
 
  * http://plugins.krajee.com/file-input
 
  *
 
  *
 
  * Author: Kartik Visweswaran
 
  * Author: Kartik Visweswaran

+ 1 - 1
themes/explorer/theme.css
Ver ficheiro 

@@ -1,5 +1,5 @@
 
 /*!

 /*!

- * bootstrap-fileinput v4.3.7

+ * bootstrap-fileinput v4.3.8

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

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

  *

  *

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

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

+ 1 - 1
themes/explorer/theme.js
Ver ficheiro 

@@ -1,5 +1,5 @@
 
 /*!

 /*!

- * bootstrap-fileinput v4.3.7

+ * bootstrap-fileinput v4.3.8

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

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

  *

  *

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

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

+ 1 - 1
themes/fa/theme.js
Ver ficheiro 

@@ -1,5 +1,5 @@
 
 /*!
 
 /*!
 
- * bootstrap-fileinput v4.3.7
 
+ * bootstrap-fileinput v4.3.8
 
  * http://plugins.krajee.com/file-input
 
  * http://plugins.krajee.com/file-input
 
  *
 
  *
 
  * Font Awesome icon theme configuration for bootstrap-fileinput. Requires font awesome assets to be loaded.
 
  * Font Awesome icon theme configuration for bootstrap-fileinput. Requires font awesome assets to be loaded.

+ 1 - 1
themes/gly/theme.js
Ver ficheiro 

@@ -1,5 +1,5 @@
 
 /*!
 
 /*!
 
- * bootstrap-fileinput v4.3.7
 
+ * bootstrap-fileinput v4.3.8
 
  * http://plugins.krajee.com/file-input
 
  * http://plugins.krajee.com/file-input
 
  *
 
  *
 
  * Glyphicon (default) theme configuration for bootstrap-fileinput.
 
  * Glyphicon (default) theme configuration for bootstrap-fileinput.

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio