v2.1.4

gasparesganga · Jun 7, 2018 · 8eda5b0 · 8eda5b0
1 parent d71d79c
commit 8eda5b0
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 
+## v2.1.4 - 2018-06-07
+### Fixed
+- Replaced the `.load()` method with a custom `ajax()` request to load external SVG images in order to prevent conflicts with `ajaxStart()` and `ajaxSend()` event handlers
+
+
+
 ## v2.1.3 - 2018-05-04
 ### Fixed
 - package.json `main` path fix

diff --git a/dist/loadingoverlay.js b/dist/loadingoverlay.js
@@ -1,7 +1,7 @@
 /***************************************************************************************************
 LoadingOverlay - A flexible loading overlay jQuery plugin
     Author          : Gaspare Sganga
-    Version         : 2.1.3
+    Version         : 2.1.4
     License         : MIT
     Documentation   : https://gasparesganga.com/labs/jquery-loading-overlay/
 ***************************************************************************************************/
@@ -275,7 +275,13 @@ LoadingOverlay - A flexible loading overlay jQuery plugin
                     if (!settings.imageClass && settings.imageColor) element.find("*").css(settings.imageColor);
                 } else if (settings.image.slice(-4).toLowerCase() === ".svg" || settings.image.slice(0, 14).toLowerCase() === "data:image/svg") {
                     // SVG file or base64-encoded SVG
-                    element.load(settings.image, function(){
+                    $.ajax({
+                        url         : settings.image,
+                        type        : "GET",
+                        dataType    : "html",
+                        global      : false
+                    }).done(function(data){
+                        element.html(data);
                         element.children().css(_css.element_svg);
                         if (!settings.imageClass && settings.imageColor) element.find("*").css(settings.imageColor);
                     });

diff --git a/dist/loadingoverlay.min.js b/dist/loadingoverlay.min.js
diff --git a/dist/loadingoverlay.min.js.map b/dist/loadingoverlay.min.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "gasparesganga-jquery-loading-overlay",
-    "version": "2.1.3",
+    "version": "2.1.4",
     "description": "A flexible loading overlay jQuery plugin",
     "homepage": "https://gasparesganga.com/labs/jquery-loading-overlay/",
     "author": "Gaspare Sganga <[email protected]> (https://gasparesganga.com)",
@@ -28,7 +28,7 @@
         "del": "^3.0.0",
         "gulp": "^4.0.0",
         "gulp-header": "^2.0.5",
-        "gulp-rename": "^1.2.2",
+        "gulp-rename": "^1.2.3",
         "gulp-replace": "^0.6.1",
         "gulp-sourcemaps": "^2.6.4",
         "gulp-uglify": "^3.0.0",

diff --git a/src/loadingoverlay.js b/src/loadingoverlay.js
@@ -1,7 +1,7 @@
 /***************************************************************************************************
 LoadingOverlay - A flexible loading overlay jQuery plugin
     Author          : Gaspare Sganga
-    Version         : 2.1.4dev
+    Version         : 2.1.4
     License         : MIT
     Documentation   : https://gasparesganga.com/labs/jquery-loading-overlay/
 ***************************************************************************************************/