Merge pull request ares-ensiie#36 from barodeur/fix_gallery_loading

use imageloaded to wait for images before masonry!
dwarffrench · Mar 8, 2013 · cf66359 · cf66359
2 parents eda0c7c + d376e23
commit cf66359
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -18,6 +18,7 @@
 //= require bootstrap-datepicker/locales/bootstrap-datepicker.fr
 //= require bootstrap/load-image.min
 //= require bootstrap/image-gallery.min
+//= require jquery.imageloaded
 //= require masonry
 //= require select2
 //= require_tree .

diff --git a/app/views/gallery/gallery/index.html.haml b/app/views/gallery/gallery/index.html.haml
@@ -38,8 +38,9 @@
                 = a.date.strftime("%F")
 
 :coffeescript
-  $(window).load ->
-    $('.albums').masonry
+  $container = $('.albums')
+  $container.imagesLoaded ->
+    $container.masonry
       itemSelector: '.album'
       columnWidth: (containerWidth) ->
         containerWidth / 4
diff --git a/vendor/assets/javascripts/jquery.imageloaded.js b/vendor/assets/javascripts/jquery.imageloaded.js