1 files changed, 34 insertions, 30 deletions

diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index 91d90b45..9d8acf28 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -58,16 +58,15 @@ $(document).ready(function() {
     $(".gContextMenu a").addClass("gButtonLink ui-icon-left");
     $(".gContextMenu a").prepend("<span class=\"ui-icon\"></span>");
     $(".gContextMenu a span").each(function() {
-      var iconClass = $(this).parent().attr("class").match(/ui-icon-.[^\s]*/).toString();
+      var iconClass = $(this).parent().attr("class").match(/ui-icon-.[^\s]+/).toString();
       $(this).addClass(iconClass);
     });
   }
 
-  // Photo/Item item view only
+  // Photo/Item item view
   if ($("#gItem").length) {
-    // Ensure that sized image versions
-    // fit inside their container
-    sizedImage();
+    // Ensure the resized image fits within its container
+    $("#gItem").gallery_fit_image();
 
     // Collapse comments form, insert button to expand
     if ($("#gAddCommentForm").length) {
@@ -87,7 +86,6 @@ $(document).ready(function() {
       duration: 1000,
       hash: true
     });
-
   }
 
   // Add hover state for buttons
@@ -104,16 +102,30 @@ $(document).ready(function() {
   // @todo apply hover affect to links
   $(".gItem").hover(
     function(){
-      var pos = $(this).position();
-      var itemClasses = $(this).attr("class");
-      var bgColor = $(this).css("background-color");
-      var cont = $(this).parent();
+      var position = $(this).position();
+      var item_classes = $(this).attr("class");
+      var bg_color = $(this).css("background-color");
+      var container = $(this).parent();
       $("#gHoverItem").remove();
-      cont.append("<div id=\"gHoverItem\"><div class=\"" + itemClasses + "\">" 
+      container.append("<div id=\"gHoverItem\"><div class=\"" + item_classes + "\">"
           + $(this).html() + "</div></div>");
-      $("#gHoverItem").css("top", pos.top);
-      $("#gHoverItem").css("left", pos.left);
-      $("#gHoverItem").css("background-color", bgColor);
+      $("#gHoverItem").css("top", position.top);
+      $("#gHoverItem").css("left", position.left);
+      $("#gHoverItem").css("background-color", bg_color);
+
+      var v_align = $(this).find(".gValign");
+      var title = $(this).find("h2");
+      var meta = $(this).find(".gMetadata");
+      var context = $(this).find(".gContextMenu");
+      var context_label = $(this).find(".gContextMenu li:first");
+      $("#gHoverItem .gItem").height(
+          $(v_align).gallery_height()
+          + $(title).gallery_height()
+          + $(meta).gallery_height()
+          + parseInt($(context).css("margin-top").replace("px",""))
+          + $(context_label).gallery_height()
+        );
+      
       $("#gHoverItem").fadeIn("fast");
       $("#gHoverItem").hover(
         function(){
@@ -123,7 +135,7 @@ $(document).ready(function() {
             function() {
               $(this).find("ul").slideDown("fast");
               var dialogLinks = $(this).find(".gDialogLink");
-              $(dialgoLinks).gallery_dialog();
+              $(dialogLinks).gallery_dialog();
             },
             function() {
               $(this).find("ul").slideUp("slow");
@@ -139,19 +151,11 @@ $(document).ready(function() {
     }
   );
 
-});
+  $.fn.gallery_height = function() {
+    var ht = $(this).height();
+    var mt = $(this).css("margin-top").replace("px","");
+    var mb = $(this).css("margin-bottom").replace("px","");
+    return ht + parseInt(mt) + parseInt(mb);
+  };
 
-/**
- * Reduce width of sized photo if it's wider than its parent container
- */
-function sizedImage() {
-  var containerWidth = $("#gItem").width();
-  var oPhoto = $("#gItem img").filter(function() {
-    return this.id.match(/gPhotoId-/);
-  });
-  if (containerWidth < oPhoto.width()) {
-    var proportion = containerWidth / oPhoto.width();
-    oPhoto.width(containerWidth);
-    oPhoto.height(proportion * oPhoto.height());
-  }
-}
+});