Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 9 insertions, 4 deletions

diff --git a/themes/wind/js/ui.init.js b/themes/wind/js/ui.init.js
index f9fb8519..6edf6be4 100644
--- a/themes/wind/js/ui.init.js
+++ b/themes/wind/js/ui.init.js
@@ -43,7 +43,7 @@ $(document).ready(function() {
     });
   }
 
-  // Album view only
+  // Album and search results views
   if ($("#g-album-grid").length) {
     // Set equal height for album items and vertically align thumbnails/metadata
     $('.g-item').equal_heights().gallery_valign();
@@ -64,7 +64,13 @@ $(document).ready(function() {
         $(this).height("auto");
         var context_menu = $(this).find(".g-context-menu");
         var adj_height = $(this).height() + context_menu.height();
-        $(this).height(adj_height);
+        if ($(this).next().height() > $(this).height()) {
+          $(this).height($(this).next().height());
+        } else if ($(this).prev().height() > $(this).height()) {
+          $(this).height($(this).prev().height());
+        } else {
+          $(this).height(adj_height);
+        }
       },
       function() {
         // Reset item height and position
@@ -92,8 +98,7 @@ $(document).ready(function() {
     $("#g-photo,#g-movie").gallery_fit_photo();
 
     // Initialize context menus
-    var resize = $("#g-photo,#g-movie").gallery_get_photo();
-    $(resize).hover(function(){
+    $("#g-photo,#g-movie").hover(function(){
       $(this).gallery_context_menu();
     });