Permalink
Browse files

Merge branch 'master' of https://github.com/joseprio/jquery_lazyload

…into 1.8.1
  • Loading branch information...
2 parents cf19bf1 + 41ca7fa commit 527490106672fb0d9ffac5ef8569d6eed3ab2e5e @tuupola committed Aug 17, 2012
Showing with 7 additions and 4 deletions.
  1. +1 −0 README.textile
  2. +3 −1 jquery.lazyload.js
  3. +2 −2 jquery.lazyload.min.js
  4. +1 −1 jquery.scrollstop.min.js
View
@@ -3,6 +3,7 @@ h3. Changelog
h4. 1.8.1
* Fix bug "#48":https://github.com/tuupola/jquery_lazyload/pull/48. In some cases initial scroll was needed for images to load. ("Nick George":https://github.com/Izzmo)
+* Fix bun "#42":https://github.com/tuupola/jquery_lazyload/pull/42. Reset internal failure counter when image is found. Makes counter logic more intuitive. ("Josep del Rio":https://github.com/joseprio)
h4. 1.8.0
View
@@ -44,6 +44,8 @@
} else if (!$.belowthefold(this, settings) &&
!$.rightoffold(this, settings)) {
$this.trigger("appear");
+ /* if we found an image we'll load, reset the counter */
+ counter = 0;
} else {
if (++counter > settings.failure_limit) {
return false;
@@ -210,4 +212,4 @@
"left-of-fold" : function(a) { return !$.rightoffold(a, {threshold : 0}); }
});
-})(jQuery, window);
+})(jQuery, window);
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

0 comments on commit 5274901

Please sign in to comment.