Merge pull request #5 from thackba/master

Change registerLazyLoad - Visible images will be loaded directly without scrolling
fhopeman · Aug 23, 2016 · d81e84e · d81e84e
2 parents ebd0b33 + 02fb9df
commit d81e84e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/spec/loadIfVisibleSpec.js b/spec/loadIfVisibleSpec.js
@@ -21,7 +21,7 @@ describe("justlazy auto loader by html object", function() {
         loadFixtures("loadIfVisible.html");
     });
 
-    it("should load visible placeholder", function(done) {
+    it("should load visible placeholder after load", function(done) {
         // given
         var placeholder1 = document.getElementById("img1");
         expect(placeholder1).toHaveAttr("data-src", base64Image);
@@ -37,9 +37,6 @@ describe("justlazy auto loader by html object", function() {
                 fail();
             }
         });
-
-        // when
-        triggerScrollEvent(0);
     });
 
    it("should load visible placeholder after scroll event", function(done) {
@@ -108,6 +105,10 @@ describe("justlazy auto loader by html object", function() {
             expect(callCount).toBe(0);
             done();
         }, 30);
+
+        // placeholder was not changed
+        expect(document.getElementById("img3")).toHaveAttr("data-src", base64Image3);
+
     });
 
     it("should remove event listener after image loading", function(done) {

diff --git a/src/justlazy.js b/src/justlazy.js
@@ -150,12 +150,16 @@
      *                                 on the screen. E.g. 200px before it become visible.
      */
     var registerLazyLoad = function(imgPlaceholder, options) {
-        var loadImgIfVisible = _loadImgIfVisible(imgPlaceholder, _validateOptions(options));
-
-        if (window.addEventListener) {
-            window.addEventListener("scroll", loadImgIfVisible, false);
+        var validatedOptions = _validateOptions(options);
+        if (_isVisible(imgPlaceholder, validatedOptions.threshold)) {
+            lazyLoad(imgPlaceholder, options);
         } else {
-            window.attachEvent("onscroll", loadImgIfVisible);
+            var loadImgIfVisible = _loadImgIfVisible(imgPlaceholder, validatedOptions);
+            if (window.addEventListener) {
+                window.addEventListener("scroll", loadImgIfVisible, false);
+            } else {
+                window.attachEvent("onscroll", loadImgIfVisible);
+            }
         }
     };