Merge pull request #1901 from vogdb/issue-1901

Breaking: Fix contentPlaceholder options construction.
cargomedia · Sep 10, 2015 · 742be7d · 742be7d
2 parents 65b0343 + 869bd12
commit 742be7d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/...tPlaceholder/jquery.contentPlaceholder.js → ...y.lazyImageSetup/jquery.lazyImageSetup.js b/...tPlaceholder/jquery.contentPlaceholder.js → ...y.lazyImageSetup/jquery.lazyImageSetup.js
@@ -8,14 +8,17 @@
    * @param {Object} [lazyLoadOptions] options to lazy-load-images plugin.
    * @returns {jQuery}
    */
-  $.fn.contentPlaceholder = function(lazyLoadOptions) {
+  $.fn.lazyImageSetup = function(lazyLoadOptions) {
     return this.each(function() {
-      var options = _.defaults(lazyLoadOptions, {
+      var options = _.defaults(lazyLoadOptions || {}, {
         threshold: 600,
         failure_limit: 10
       });
-      var self = this;
-      $(this).find('img.lazy').lazyload(options);
+      var $this = $(this);
+      if ($this.hasClass('scrollable')) {
+        options.container = $this;
+      }
+      $this.find('img.lazy').lazyload(options);
     });
   };
 

diff --git a/library/CM/App.js b/library/CM/App.js
@@ -332,11 +332,11 @@ var CM_App = CM_Class_Abstract.extend({
         $doNotLoadOnReady = $doNotLoadOnReady.add($notFirstImages);
 
         $(this).on('toggle.clipSlide', function() {
-          $(this).find('.contentPlaceholder:gt(0)').contentPlaceholder();
+          $(this).find('.contentPlaceholder:gt(0)').lazyImageSetup();
         });
       });
 
-      $dom.find('.contentPlaceholder').not($doNotLoadOnReady).contentPlaceholder();
+      $dom.find('.contentPlaceholder').not($doNotLoadOnReady).lazyImageSetup();
     },
 
     /**