clarify height calculation (fixes aFarkas#709)

scantist-ossops-m2 · Oct 5, 2019 · 01fe486 · 01fe486
1 parent 7ac087e
commit 01fe486
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 9 deletions.
diff --git a/lazysizes-umd.js b/lazysizes-umd.js
@@ -75,7 +75,6 @@
 	var requestIdleCallback = window.requestIdleCallback;
 
 	var regPicture = /^picture$/i;
-	var regLoadElements = /^img|iframe$/i;
 
 	var loadEvents = ['load', 'error', 'lazyincluded', '_lazyloaded'];
 
@@ -316,7 +315,7 @@
 				isBodyHidden = getCSS(document.body, 'visibility') == 'hidden';
 			}
 
-			return isBodyHidden || (getCSS(elem.parentNode, 'visibility') != 'hidden' && getCSS(elem, 'visibility') != 'hidden');
+			return isBodyHidden || !(getCSS(elem.parentNode, 'visibility') == 'hidden' && getCSS(elem, 'visibility') == 'hidden');
 		};
 
 		var isNestedVisible = function(elem, elemExpand){
@@ -484,7 +483,7 @@
 					isPicture = parent && regPicture.test(parent.nodeName || '');
 				}
 
-				firesLoad = detail.firesLoad || !!(('src' in elem && regLoadElements.test(elem.nodeName)) && (srcset || src || isPicture));
+				firesLoad = detail.firesLoad || (('src' in elem) && (srcset || src || isPicture));
 
 				event = {target: elem};
 

diff --git a/lazysizes-umd.min.js b/lazysizes-umd.min.js
diff --git a/lazysizes.js b/lazysizes.js
@@ -73,7 +73,6 @@
 	var requestIdleCallback = window.requestIdleCallback;
 
 	var regPicture = /^picture$/i;
-	var regLoadElements = /^img|iframe$/i;
 
 	var loadEvents = ['load', 'error', 'lazyincluded', '_lazyloaded'];
 
@@ -314,7 +313,7 @@
 				isBodyHidden = getCSS(document.body, 'visibility') == 'hidden';
 			}
 
-			return isBodyHidden || (getCSS(elem.parentNode, 'visibility') != 'hidden' && getCSS(elem, 'visibility') != 'hidden');
+			return isBodyHidden || !(getCSS(elem.parentNode, 'visibility') == 'hidden' && getCSS(elem, 'visibility') == 'hidden');
 		};
 
 		var isNestedVisible = function(elem, elemExpand){
@@ -482,7 +481,7 @@
 					isPicture = parent && regPicture.test(parent.nodeName || '');
 				}
 
-				firesLoad = detail.firesLoad || !!(('src' in elem && regLoadElements.test(elem.nodeName)) && (srcset || src || isPicture));
+				firesLoad = detail.firesLoad || (('src' in elem) && (srcset || src || isPicture));
 
 				event = {target: elem};