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

1 files changed, 8 insertions, 4 deletions

diff --git a/lib/gallery.common.js b/lib/gallery.common.js
index 844e219b..a959d90d 100644
--- a/lib/gallery.common.js
+++ b/lib/gallery.common.js
@@ -112,15 +112,19 @@
   };
 
   $.fn.gallery_context_menu = function() {
+    var in_progress = 0;
+    $(".gContextMenu *").removeAttr('title');
     $(".gContextMenu ul").hide();
     $(".gContextMenu").hover(
       function() {
-        $(this).find("ul").slideDown("fast");
-        $(this).find(".gDialogLink").gallery_dialog();
-        $(this).find(".gAjaxLink").gallery_ajax();
+        if (in_progress == 0) {
+          $(this).find("ul").slideDown("fast", function() { in_progress = 1; });
+          $(this).find(".gDialogLink").gallery_dialog();
+          $(this).find(".gAjaxLink").gallery_ajax();
+        }
       },
       function() {
-        $(this).find("ul").slideUp("slow");
+        $(this).find("ul").slideUp("slow", function() { in_progress = 0; });
       }
     );
   };