From 7d36f43d0bf3ab8765820b9496a41f2f75ca85c4 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Wed, 19 Aug 2009 18:51:14 -0600 Subject: Update docblocks and todos --- themes/default/js/ui.init.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'themes/default/js') diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js index ef7e43d9..2391f638 100644 --- a/themes/default/js/ui.init.js +++ b/themes/default/js/ui.init.js @@ -1,8 +1,5 @@ /** - * Initialize jQuery UI and Plugin elements - * - * @todo Standardize how elements requiring listeners are handled - * http://docs.jquery.com/Events/live + * Initialize jQuery UI and Gallery Plugin elements */ var shortForms = new Array( @@ -13,9 +10,6 @@ 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({ -- cgit v1.2.3 From 457708311a466d8b116d5b28575be1bc3baad864 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 23 Aug 2009 14:58:26 -0600 Subject: Cut down on jittering of the context menu on open on resize view. --- lib/gallery.common.js | 12 ++++++++---- themes/default/js/.DS_Store | Bin 0 -> 6148 bytes 2 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 themes/default/js/.DS_Store (limited to 'themes/default/js') diff --git a/lib/gallery.common.js b/lib/gallery.common.js index 06775d79..16cb7ea2 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; }); } ); }; diff --git a/themes/default/js/.DS_Store b/themes/default/js/.DS_Store new file mode 100644 index 00000000..5008ddfc Binary files /dev/null and b/themes/default/js/.DS_Store differ -- cgit v1.2.3 From deafc01c21887d8b699f26f9358a7acbf765151b Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sun, 23 Aug 2009 15:05:18 -0700 Subject: Remove accidentally submitted .DS_Store file. --- themes/default/js/.DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 themes/default/js/.DS_Store (limited to 'themes/default/js') diff --git a/themes/default/js/.DS_Store b/themes/default/js/.DS_Store deleted file mode 100644 index 5008ddfc..00000000 Binary files a/themes/default/js/.DS_Store and /dev/null differ -- cgit v1.2.3