Merge commit 'upstream/master'

1 files changed, 27 insertions, 0 deletions

diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index 9d9d3079..92a42ded 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -13,6 +13,9 @@ var shortForms = new Array(
 
 $(document).ready(function() {
 
+  // Remove .gMenu from thumb menu's before initializing Superfish
+  // @todo gallery_menu should only apply gMenu to top-level menus, submenus should be gSubMenu-N
+
   // Initialize Superfish menus
   $("ul.gMenu").addClass("sf-menu");
   $('ul.sf-menu').superfish({
@@ -91,6 +94,30 @@ $(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");
+      }
+    );
+  }
+
 });
 
 /**