Merge pull request #2410 from vogdb/issue-2410

Fix lazyload memory leak
cargomedia · Nov 23, 2016 · ca8193a · ca8193a
2 parents 010c646 + ed66acb
commit ca8193a
Show file tree

Hide file tree

Showing 5 changed files with 385 additions and 245 deletions.
diff --git a/client-vendor/after-body/jquery.lazyImageSetup/jquery.lazyImageSetup.js b/client-vendor/after-body/jquery.lazyImageSetup/jquery.lazyImageSetup.js
@@ -11,14 +11,14 @@
   $.fn.lazyImageSetup = function(lazyLoadOptions) {
     return this.each(function() {
       var options = _.defaults(lazyLoadOptions || {}, {
-        threshold: 600,
-        failure_limit: 10
+        offset: 600,
+        attribute: 'original'
       });
       var $this = $(this);
       if ($this.closest('.scrollable').length) {
         options.container = $this.closest('.scrollable');
       }
-      $this.find('img.lazy').lazyload(options);
+      $this.find('img.lazy').unveil(options);
     });
   };
 

diff --git a/client-vendor/after-body/jquery.lazyload/jquery.lazyload.js b/client-vendor/after-body/jquery.lazyload/jquery.lazyload.js
diff --git a/client-vendor/after-body/jquery.unveil2/README.md b/client-vendor/after-body/jquery.unveil2/README.md
@@ -0,0 +1,5 @@
+Currently we use a custom fork https://github.com/vogdb/unveil2. As soon as out changes are merged please remove this file.
+Our changes are:
+- https://github.com/nabble/unveil2/pull/27
+- https://github.com/nabble/unveil2/pull/28
+- https://github.com/nabble/unveil2/pull/30