From de211db665b63fe75cfc41dbb75648e5ac2e0670 Mon Sep 17 00:00:00 2001 From: "hirono@chromium.org" Date: Tue, 1 Oct 2013 07:19:57 +0000 Subject: Originally MenuButton can show the empty menu but operating the empty menu by keyboard caused to freeze. This CL adds a guard and prevents MenuButton from opening the empty menu. BUG=244300 TEST=manually Review URL: https://codereview.chromium.org/25211002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226175 0039d316-1c4b-4281-b951-d872f2087c98 --- ui/webui/resources/js/cr/ui/menu_button.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'ui/webui') diff --git a/ui/webui/resources/js/cr/ui/menu_button.js b/ui/webui/resources/js/cr/ui/menu_button.js index 8a34919..6130abd 100644 --- a/ui/webui/resources/js/cr/ui/menu_button.js +++ b/ui/webui/resources/js/cr/ui/menu_button.js @@ -149,6 +149,9 @@ cr.define('cr.ui', function() { showMenu: function(shouldSetFocus) { this.hideMenu(); + if (!this.menu.length) + return; + this.menu.updateCommands(this); var event = document.createEvent('UIEvents'); -- cgit v1.1