From d68278e41f92e0d2766cc93b632ba98be43207f0 Mon Sep 17 00:00:00 2001 From: Aparajita Fishman Date: Tue, 27 Mar 2012 11:19:41 -0700 Subject: [PATCH] Use isMenuBar instead of testing class --- AppKit/CPMenu/_CPMenuManager.j | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/AppKit/CPMenu/_CPMenuManager.j b/AppKit/CPMenu/_CPMenuManager.j index b97f47331..bbd9e45fe 100644 --- a/AppKit/CPMenu/_CPMenuManager.j +++ b/AppKit/CPMenu/_CPMenuManager.j @@ -255,7 +255,7 @@ var STICKY_TIME_INTERVAL = 500, 3. The current item has a submenu with a custom action. */ if (_mouseWasDragged || - [activeMenuContainer isKindOfClass:_CPMenuBarWindow] || + [activeMenuContainer isMenuBar] || [activeItem action] !== @selector(submenuAction:)) { [trackingMenu cancelTracking]; @@ -273,7 +273,7 @@ var STICKY_TIME_INTERVAL = 500, } // If the item has a submenu, show it. - if ([activeItem hasSubmenu])// && [activeItem action] === @selector(submenuAction:)) + if ([activeItem hasSubmenu]) // && [activeItem action] === @selector(submenuAction:)) { var activeItemRect = [activeMenuContainer rectForItemAtIndex:activeItemIndex], newMenuOrigin; @@ -427,7 +427,7 @@ var STICKY_TIME_INTERVAL = 500, break; // If this menu is already being shown, unhighlight and return. - if (menu === newMenu)//&& [menu supermenu] === baseMenu) + if (menu === newMenu) //&& [menu supermenu] === baseMenu) return [newMenu _highlightItemAtIndex:CPNotFound]; [menuContainer orderOut:self];