1 files changed, 48 insertions, 27 deletions

diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index b8ad68db..91d90b45 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -32,7 +32,6 @@ $(document).ready(function() {
   $("#gMessage li").gallery_show_message();
 
   // Initialize dialogs
-  $(".gMenuLink").addClass("gDialogLink");
   $("#gLoginLink").addClass("gDialogLink");
   $(".gDialogLink").gallery_dialog();
 
@@ -54,8 +53,13 @@ $(document).ready(function() {
   if ($("#gAlbumGrid").length) {
     // Vertical align thumbnails/metadata in album grid
     $(".gItem").gallery_valign();
-    $(".gQuick").ajaxStop(function(){
-      $(".gItem").gallery_valign();
+    // Apply styles to gContextMenu
+    $(".gContextMenu li").addClass("ui-state-default");
+    $(".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();
+      $(this).addClass(iconClass);
     });
   }
 
@@ -67,7 +71,9 @@ $(document).ready(function() {
 
     // Collapse comments form, insert button to expand
     if ($("#gAddCommentForm").length) {
-      var showCommentForm = '<a href="#add_comment_form" class="showCommentForm gButtonLink ui-corner-all ui-icon-left ui-state-default right"><span class="ui-icon ui-icon-comment"></span>' + ADD_A_COMMENT + '</a>';
+      var showCommentForm = '<a href="#add_comment_form"'
+        + ' class="showCommentForm gButtonLink ui-corner-all ui-icon-left ui-state-default right">'
+        + '<span class="ui-icon ui-icon-comment"></span>' + ADD_A_COMMENT + '</a>';
       $("#gAddCommentForm").hide();
       $("#gComments").prepend(showCommentForm);
       $(".showCommentForm").click(function(){
@@ -94,29 +100,44 @@ $(document).ready(function() {
     }
   );
 
-  // Initialize thumbnail menus
-  // @todo Toggle between north and south caret's on hover
-  if ($("#gContent .gThumbMenu").length) {
-    $("#gContent .gThumbMenu li").addClass("ui-state-default");
-    $("#gContent .gThumbMenu li a")
-      .not('[class]')
-      .addClass("gButtonLink ui-icon ui-icon-caret-l-n")
-      .css({
-        height: "10px",
-        margin: "0",
-        padding: "0 0 3px 0"
-      });
-
-    $(".gThumbMenu ul").hide();
-    $(".gThumbMenu").hover(
-      function() {
-        $(this).find("ul").slideDown("fast");
-      },
-      function() {
-	      $(this).find("ul").slideUp("slow");
-      }
-    );
-  }
+  // Initialize context menus
+  // @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();
+      $("#gHoverItem").remove();
+      cont.append("<div id=\"gHoverItem\"><div class=\"" + itemClasses + "\">" 
+          + $(this).html() + "</div></div>");
+      $("#gHoverItem").css("top", pos.top);
+      $("#gHoverItem").css("left", pos.left);
+      $("#gHoverItem").css("background-color", bgColor);
+      $("#gHoverItem").fadeIn("fast");
+      $("#gHoverItem").hover(
+        function(){
+          // Initialize context menus
+          $(".gContextMenu ul").hide();
+          $(".gContextMenu").hover(
+            function() {
+              $(this).find("ul").slideDown("fast");
+              var dialogLinks = $(this).find(".gDialogLink");
+              $(dialgoLinks).gallery_dialog();
+            },
+            function() {
+              $(this).find("ul").slideUp("slow");
+            }
+          );
+        },
+        function() {
+          $(this).hide();
+        }
+      );
+    },
+    function(){
+    }
+  );
 
 });