Merge pull request #717 from cozzbie/gh-pages

Fix issues with SSR builds by adding window bind and Date reference.
aFarkas · Nov 8, 2019 · 55f936b · 55f936b
2 parents 7a7f5d9 + 780e6d3
commit 55f936b
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 20 deletions.
diff --git a/lazysizes-umd.js b/lazysizes-umd.js
@@ -1,13 +1,13 @@
 (function(window, factory) {
-	var lazySizes = factory(window, window.document);
+	var lazySizes = factory(window, window.document, Date);
 	if(typeof module == 'object' && module.exports){
 		module.exports = lazySizes;
 	} else if (typeof define == 'function' && define.amd) {
 		define(lazySizes);
 	} else {
 		window.lazySizes = lazySizes;
 	}
-}(window, function l(window, document) {
+}(window, function l(window, document, Date) {
 	'use strict';
 	/*jshint eqnull:true */
 
@@ -58,15 +58,13 @@
 
 	var docElem = document.documentElement;
 
-	var Date = window.Date;
-
 	var supportPicture = window.HTMLPictureElement;
 
 	var _addEventListener = 'addEventListener';
 
 	var _getAttribute = 'getAttribute';
 
-	var addEventListener = window[_addEventListener];
+	var addEventListener = window[_addEventListener].bind(window);
 
 	var setTimeout = window.setTimeout;
 

diff --git a/lazysizes.js b/lazysizes.js
@@ -1,11 +1,11 @@
 (function(window, factory) {
-	var lazySizes = factory(window, window.document);
+	var lazySizes = factory(window, window.document, Date);
 	window.lazySizes = lazySizes;
 	if(typeof module == 'object' && module.exports){
 		module.exports = lazySizes;
 	}
 }(typeof window != 'undefined' ?
-      window : {}, function l(window, document) {
+      window : {}, function l(window, document, Date) {
 	'use strict';
 	/*jshint eqnull:true */
 
@@ -56,15 +56,13 @@
 
 	var docElem = document.documentElement;
 
-	var Date = window.Date;
-
 	var supportPicture = window.HTMLPictureElement;
 
 	var _addEventListener = 'addEventListener';
 
 	var _getAttribute = 'getAttribute';
 
-	var addEventListener = window[_addEventListener];
+	var addEventListener = window[_addEventListener].bind(window);
 
 	var setTimeout = window.setTimeout;
 

diff --git a/src/common.wrapper b/src/common.wrapper
@@ -1,5 +1,5 @@
 (function(window, factory) {
-	var lazySizes = factory(window, window.document);
+	var lazySizes = factory(window, window.document, Date);
 	window.lazySizes = lazySizes;
 	if(typeof module == 'object' && module.exports){
 		module.exports = lazySizes;

diff --git a/src/lazysizes-core.js b/src/lazysizes-core.js
@@ -1,4 +1,4 @@
-function l(window, document) {
+function l(window, document, Date) { // Pass in the windoe Date function also for SSR because the Date class can be lost
 	'use strict';
 	/*jshint eqnull:true */
 
@@ -49,15 +49,17 @@ function l(window, document) {
 
 	var docElem = document.documentElement;
 
-	var Date = window.Date;
-
 	var supportPicture = window.HTMLPictureElement;
 
 	var _addEventListener = 'addEventListener';
 
 	var _getAttribute = 'getAttribute';
 
-	var addEventListener = window[_addEventListener];
+	/**
+	 * Update to bind to window because 'this' becomes null during SSR
+	 * builds.
+	 */
+	var addEventListener = window[_addEventListener].bind(window);
 
 	var setTimeout = window.setTimeout;
 

diff --git a/src/lazysizes-intersection.js b/src/lazysizes-intersection.js
@@ -2,9 +2,9 @@
 	if(typeof module == 'object' && module.exports){
 		module.exports = lazySizes;
 	} else {
-		window.lazySizes = factory(window, window.document);
+		window.lazySizes = factory(window, window.document, Date);
 	}
-}(window, function l(window, document) {
+}(window, function l(window, document, Date) {
 	'use strict';
 
 	/*jshint eqnull:true */
@@ -14,15 +14,13 @@
 
 	var docElem = document.documentElement;
 
-	var Date = window.Date;
-
 	var supportPicture = window.HTMLPictureElement;
 
 	var _addEventListener = 'addEventListener';
 
 	var _getAttribute = 'getAttribute';
 
-	var addEventListener = window[_addEventListener];
+	var addEventListener = window[_addEventListener].bind(window);
 
 	var setTimeout = window.setTimeout;