Merge branch 'hotfix/12.0.2'

verlok · Sep 28, 2019 · 5732436 · 5732436
2 parents 8a34c0b + 9bfee2a
commit 5732436
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,9 +2,13 @@
 
 ## Version 12
 
+#### 12.0.2
+
+Improved detection of browser support of IntersectionObserver, as suggested in #362. Thanks to @kaldonir
+
 #### 12.0.1
 
-- Updated CHANGELOG.md and README.md to mention the change of the option name `callback_load` which is called `callback_loaded` in versions 11.0.0 and above.
+Updated CHANGELOG.md and README.md to mention the change of the option name `callback_load` which is called `callback_loaded` in versions 11.0.0 and above.
 
 #### 12.0.0 
 

diff --git a/dist/lazyload.amd.js b/dist/lazyload.amd.js
@@ -5,7 +5,7 @@ define(function () {
 
   var runningOnBrowser = typeof window !== "undefined";
   var isBot = runningOnBrowser && !("onscroll" in window) || typeof navigator !== "undefined" && /(gle|ing|ro)bot|crawl|spider/i.test(navigator.userAgent);
-  var supportsIntersectionObserver = runningOnBrowser && "IntersectionObserver" in window;
+  var supportsIntersectionObserver = runningOnBrowser && "IntersectionObserver" in window && "IntersectionObserverEntry" in window && "intersectionRatio" in window.IntersectionObserverEntry.prototype && "isIntersecting" in window.IntersectionObserverEntry.prototype;
   var supportsClassList = runningOnBrowser && "classList" in document.createElement("p");
   var defaultSettings = {
     elements_selector: "img",

diff --git a/dist/lazyload.amd.min.js b/dist/lazyload.amd.min.js
diff --git a/dist/lazyload.amd.min.js.map b/dist/lazyload.amd.min.js.map
diff --git a/dist/lazyload.esm.js b/dist/lazyload.esm.js
@@ -6,7 +6,11 @@ const isBot =
 		/(gle|ing|ro)bot|crawl|spider/i.test(navigator.userAgent));
 
 const supportsIntersectionObserver =
-	runningOnBrowser && "IntersectionObserver" in window;
+	runningOnBrowser &&
+	"IntersectionObserver" in window &&
+	"IntersectionObserverEntry" in window &&
+	"intersectionRatio" in window.IntersectionObserverEntry.prototype &&
+	"isIntersecting" in window.IntersectionObserverEntry.prototype;
 
 const supportsClassList =
 	runningOnBrowser && "classList" in document.createElement("p");

diff --git a/dist/lazyload.iife.js b/dist/lazyload.iife.js
@@ -5,7 +5,7 @@ var LazyLoad = function () {
 
   var runningOnBrowser = typeof window !== "undefined";
   var isBot = runningOnBrowser && !("onscroll" in window) || typeof navigator !== "undefined" && /(gle|ing|ro)bot|crawl|spider/i.test(navigator.userAgent);
-  var supportsIntersectionObserver = runningOnBrowser && "IntersectionObserver" in window;
+  var supportsIntersectionObserver = runningOnBrowser && "IntersectionObserver" in window && "IntersectionObserverEntry" in window && "intersectionRatio" in window.IntersectionObserverEntry.prototype && "isIntersecting" in window.IntersectionObserverEntry.prototype;
   var supportsClassList = runningOnBrowser && "classList" in document.createElement("p");
   var defaultSettings = {
     elements_selector: "img",