Updates to release 5.2.6 fix #1756

kartik-v · Sep 19, 2021 · 5b16acb · 5b16acb
1 parent b2526e4
commit 5b16acb
Show file tree

Hide file tree

Showing 38 changed files with 63 additions and 51 deletions.
diff --git a/CHANGE.md b/CHANGE.md
@@ -1,6 +1,12 @@
 Change Log: `bootstrap-fileinput`
 =================================
 
+## version 5.2.6
+
+**Date**: _under development_
+
+- (enh #1756): Replace `getLoadingUrl` to a new `$h.getZoomPlaceholder` method.
+
 ## version 5.2.5
 
 **Date**: 19-Sep-2021

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "bootstrap-fileinput",
-    "version": "5.2.5",
+    "version": "5.2.6",
     "homepage": "https://github.com/kartik-v/bootstrap-fileinput",
     "authors": [
         "Kartik Visweswaran <kartikv2@gmail.com>"

diff --git a/css/fileinput-rtl.css b/css/fileinput-rtl.css
@@ -1,5 +1,5 @@
 /*!
- * bootstrap-fileinput v5.2.5
+ * bootstrap-fileinput v5.2.6
  * http://plugins.krajee.com/file-input
  *
  * Krajee RTL (Right To Left) default styling for bootstrap-fileinput.

diff --git a/css/fileinput-rtl.min.css b/css/fileinput-rtl.min.css
diff --git a/css/fileinput.css b/css/fileinput.css
@@ -1,5 +1,5 @@
 /*!
- * bootstrap-fileinput v5.2.5
+ * bootstrap-fileinput v5.2.6
  * http://plugins.krajee.com/file-input
  *
  * Krajee default styling for bootstrap-fileinput.

diff --git a/css/fileinput.min.css b/css/fileinput.min.css
diff --git a/examples/index-bs3.html b/examples/index-bs3.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- release v5.2.5, copyright 2014 - 2021 Kartik Visweswaran -->
+<!-- release v5.2.6, copyright 2014 - 2021 Kartik Visweswaran -->
 <!--suppress JSUnresolvedLibraryURL -->
 <html lang="en">
 <head>

diff --git a/examples/index-bs4.html b/examples/index-bs4.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- release v5.2.5, copyright 2014 - 2021 Kartik Visweswaran -->
+<!-- release v5.2.6, copyright 2014 - 2021 Kartik Visweswaran -->
 <!--suppress JSUnresolvedLibraryURL -->
 <html lang="en">
 <head>

diff --git a/examples/index-bs5.html b/examples/index-bs5.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- release v5.2.5, copyright 2014 - 2021 Kartik Visweswaran -->
+<!-- release v5.2.6, copyright 2014 - 2021 Kartik Visweswaran -->
 <!--suppress JSUnresolvedLibraryURL -->
 <html lang="en">
 <head>

diff --git a/js/fileinput.js b/js/fileinput.js
@@ -1,5 +1,5 @@
 /*!
- * bootstrap-fileinput v5.2.5
+ * bootstrap-fileinput v5.2.6
  * http://plugins.krajee.com/file-input
  *
  * Author: Kartik Visweswaran
@@ -24,8 +24,8 @@
     $.fn.fileinputThemes = {};
 
     if (!$.fn.fileinputBsVersion) {
-        $.fn.fileinputBsVersion = (window.Alert && window.Alert.VERSION) ||
-            (window.bootstrap && window.bootstrap.Alert && bootstrap.Alert.VERSION) || '3.x.x';
+        var v = (bootstrap && bootstrap.Alert && bootstrap.Alert.VERSION) || (Alert && Alert.VERSION) || '3.x.x';
+        $.fn.fileinputBsVersion = v;
     }
 
     String.prototype.setTokens = function (replacePairs) {
@@ -45,17 +45,14 @@
         };
     }
 
-    var $h, FileInput, getLoadingUrl = function () {
-        var src = document.currentScript.src, srcPath = src.substring(0, src.lastIndexOf("/"));
-        return srcPath.substring(0, srcPath.lastIndexOf("/") + 1) + 'img/loading.gif'
-    };
+    var $h, FileInput;
 
     // fileinput helper object for all global variables and internal helper methods
     $h = {
         FRAMES: '.kv-preview-thumb',
         SORT_CSS: 'file-sortable',
         INIT_FLAG: 'init-',
-        ZOOM_VAR: getLoadingUrl() + '?kvTemp__2873389129__=', // used to prevent 404 errors in URL parsing
+        SCRIPT_SRC: document && document.currentScript && document.currentScript.src || null,
         OBJECT_PARAMS: '<param name="controller" value="true" />\n' +
             '<param name="allowFullScreen" value="true" />\n' +
             '<param name="allowScriptAccess" value="always" />\n' +
@@ -87,6 +84,14 @@
 
         },
         objUrl: window.URL || window.webkitURL,
+        getZoomPlaceholder: function () { // used to prevent 404 errors in URL parsing
+            var src = $h.SCRIPT_SRC, srcPath, zoomVar = '?kvTemp__2873389129__=';
+            if (!src) {
+                return zoomVar;
+            }
+            srcPath = src.substring(0, src.lastIndexOf("/"));
+            return srcPath.substring(0, srcPath.lastIndexOf("/") + 1) + 'img/loading.gif' + zoomVar;
+        },
         isBs: function (ver) {
             var chk = $.trim(($.fn.fileinputBsVersion || '') + '');
             ver = parseInt(ver, 10);
@@ -892,6 +897,7 @@
         _init: function (options, refreshMode) {
             var self = this, f, $el = self.$element, $cont, t, tmp;
             self.options = options;
+            self.zoomPlaceholder = $h.getZoomPlaceholder();
             self.canOrientImage = $h.canOrientImage($el);
             $.each(options, function (key, value) {
                 switch (key) {
@@ -2976,7 +2982,7 @@
                 slideIn = 'slideIn' + dir, slideOut = 'slideOut' + dir, parsed, zoomData = $frame.data('zoom');
             if (zoomData) {
                 zoomData = decodeURIComponent(zoomData);
-                parsed = $zoomPreview.html().replace($h.ZOOM_VAR, '').setTokens({zoomData: zoomData});
+                parsed = $zoomPreview.html().replace(self.zoomPlaceholder, '').setTokens({zoomData: zoomData});
                 $zoomPreview.html(parsed);
                 $frame.data('zoom', '');
                 $zoomPreview.attr('data-zoom', zoomData);
@@ -4235,7 +4241,7 @@
                     'fileid': fileId || '',
                     'typeCss': typeCss,
                     'footer': footer,
-                    'data': zoom && vZoomData ? $h.ZOOM_VAR + '{zoomData}' : vData,
+                    'data': zoom && vZoomData ? self.zoomPlaceholder + '{zoomData}' : vData,
                     'template': templ || cat,
                     'style': styleAttribs ? 'style="' + styleAttribs + '"' : '',
                     'zoomData': vZoomData ? encodeURIComponent(vZoomData) : ''

diff --git a/js/fileinput.min.js b/js/fileinput.min.js
diff --git a/nuget/Package.nuspec b/nuget/Package.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>bootstrap-fileinput</id>
 	<title>bootstrap-fileinput</title>
-    <version>5.2.5</version>
+    <version>5.2.6</version>
     <authors>Kartik Visweswaran</authors>
     <owners>Kartik Visweswaran</owners>
     <licenseUrl>https://github.com/kartik-v/bootstrap-fileinput/blob/master/LICENSE.md</licenseUrl>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "bootstrap-fileinput",
-    "version": "5.2.5",
+    "version": "5.2.6",
     "homepage": "https://github.com/kartik-v/bootstrap-fileinput",
     "authors": [
         "Kartik Visweswaran <kartikv2@gmail.com>"

diff --git a/scss/fileinput-rtl.scss b/scss/fileinput-rtl.scss
@@ -1,5 +1,5 @@
 /*!
- * bootstrap-fileinput v5.2.5
+ * bootstrap-fileinput v5.2.6
  * http://plugins.krajee.com/file-input
  *
  * Krajee RTL (Right To Left) default styling for bootstrap-fileinput.

diff --git a/scss/fileinput.scss b/scss/fileinput.scss
@@ -1,5 +1,5 @@
 /*!
- * bootstrap-fileinput v5.2.5
+ * bootstrap-fileinput v5.2.6
  * http://plugins.krajee.com/file-input
  *
  * Krajee default styling for bootstrap-fileinput.

diff --git a/scss/themes/explorer-fa/theme.scss b/scss/themes/explorer-fa/theme.scss
@@ -1,5 +1,5 @@
 /*!
- * bootstrap-fileinput v5.2.5
+ * bootstrap-fileinput v5.2.6
  * http://plugins.krajee.com/file-input
  *
  * Krajee Explorer Font Awesome 4.x theme style for bootstrap-fileinput. Load this theme file after loading

diff --git a/scss/themes/explorer-fas/theme.scss b/scss/themes/explorer-fas/theme.scss
@@ -1,5 +1,5 @@
 /*!
- * bootstrap-fileinput v5.2.5
+ * bootstrap-fileinput v5.2.6
  * http://plugins.krajee.com/file-input
  *
  * Krajee Explorer Font Awesome 5.x theme style for bootstrap-fileinput. Load this theme file after loading

diff --git a/scss/themes/explorer/theme.scss b/scss/themes/explorer/theme.scss
@@ -1,5 +1,5 @@
 /*!
- * bootstrap-fileinput v5.2.5
+ * bootstrap-fileinput v5.2.6
  * http://plugins.krajee.com/file-input
  *
  * Krajee Explorer theme style for bootstrap-fileinput. Load this theme file after loading `fileinput.css`.

diff --git a/themes/bs5/theme.js b/themes/bs5/theme.js
@@ -1,5 +1,5 @@
 /*!
- * bootstrap-fileinput v5.2.5
+ * bootstrap-fileinput v5.2.6
  * http://plugins.krajee.com/file-input
  *
  * Bootstrap 5.x icon theme configuration for bootstrap-fileinput. Requires bootstrap 5.x icons CSS to be loaded.

diff --git a/themes/bs5/theme.min.js b/themes/bs5/theme.min.js
diff --git a/themes/explorer-fa/theme.css b/themes/explorer-fa/theme.css
@@ -1,5 +1,5 @@
 /*!
- * bootstrap-fileinput v5.2.5
+ * bootstrap-fileinput v5.2.6
  * http://plugins.krajee.com/file-input
  *
  * Krajee Explorer Font Awesome 5.x theme style for bootstrap-fileinput. Load this theme file after loading

diff --git a/themes/explorer-fa/theme.js b/themes/explorer-fa/theme.js
@@ -1,5 +1,5 @@
 /*!
- * bootstrap-fileinput v5.2.5
+ * bootstrap-fileinput v5.2.6
  * http://plugins.krajee.com/file-input
  *
  * Krajee Explorer Font Awesome theme configuration for bootstrap-fileinput. 

diff --git a/themes/explorer-fa/theme.min.css b/themes/explorer-fa/theme.min.css
diff --git a/themes/explorer-fa/theme.min.js b/themes/explorer-fa/theme.min.js
diff --git a/themes/explorer-fas/theme.css b/themes/explorer-fas/theme.css
@@ -1,5 +1,5 @@
 /*!
- * bootstrap-fileinput v5.2.5
+ * bootstrap-fileinput v5.2.6
  * http://plugins.krajee.com/file-input
  *
  * Krajee Explorer Font Awesome 5.x theme style for bootstrap-fileinput. Load this theme file after loading

diff --git a/themes/explorer-fas/theme.js b/themes/explorer-fas/theme.js
@@ -1,5 +1,5 @@
 /*!
- * bootstrap-fileinput v5.2.5
+ * bootstrap-fileinput v5.2.6
  * http://plugins.krajee.com/file-input
  *
  * Krajee Explorer Font Awesome theme configuration for bootstrap-fileinput.

diff --git a/themes/explorer-fas/theme.min.css b/themes/explorer-fas/theme.min.css
diff --git a/themes/explorer-fas/theme.min.js b/themes/explorer-fas/theme.min.js
diff --git a/themes/explorer/theme.css b/themes/explorer/theme.css
@@ -1,5 +1,5 @@
 /*!
- * bootstrap-fileinput v5.2.5
+ * bootstrap-fileinput v5.2.6
  * http://plugins.krajee.com/file-input
  *
  * Krajee Explorer theme style for bootstrap-fileinput. Load this theme file after loading `fileinput.css`.

diff --git a/themes/explorer/theme.js b/themes/explorer/theme.js
@@ -1,5 +1,5 @@
 /*!
- * bootstrap-fileinput v5.2.5
+ * bootstrap-fileinput v5.2.6
  * http://plugins.krajee.com/file-input
  *
  * Krajee Explorer theme configuration for bootstrap-fileinput. Load this theme file after loading `fileinput.js`.

diff --git a/themes/explorer/theme.min.css b/themes/explorer/theme.min.css
diff --git a/themes/explorer/theme.min.js b/themes/explorer/theme.min.js
@@ -1,5 +1,5 @@
 /*!
- * bootstrap-fileinput v5.2.5
+ * bootstrap-fileinput v5.2.6
  * http://plugins.krajee.com/file-input
  *
  * Krajee Explorer theme configuration for bootstrap-fileinput. Load this theme file after loading `fileinput.js`.

diff --git a/themes/fa/theme.js b/themes/fa/theme.js
@@ -1,5 +1,5 @@
 /*!
- * bootstrap-fileinput v5.2.5
+ * bootstrap-fileinput v5.2.6
  * http://plugins.krajee.com/file-input
  *
  * Font Awesome icon theme configuration for bootstrap-fileinput. Requires font awesome assets to be loaded.

diff --git a/themes/fa/theme.min.js b/themes/fa/theme.min.js
diff --git a/themes/fas/theme.js b/themes/fas/theme.js
@@ -1,5 +1,5 @@
 /*!
- * bootstrap-fileinput v5.2.5
+ * bootstrap-fileinput v5.2.6
  * http://plugins.krajee.com/file-input
  *
  * Font Awesome 5 icon theme configuration for bootstrap-fileinput. Requires font awesome 5 assets to be loaded.

diff --git a/themes/fas/theme.min.js b/themes/fas/theme.min.js
diff --git a/themes/gly/theme.js b/themes/gly/theme.js
@@ -1,5 +1,5 @@
 /*!
- * bootstrap-fileinput v5.2.5
+ * bootstrap-fileinput v5.2.6
  * http://plugins.krajee.com/file-input
  *
  * Glyphicon (default) theme configuration for bootstrap-fileinput.

diff --git a/themes/gly/theme.min.js b/themes/gly/theme.min.js