[gnome-shell/wip/aggregate-menu: 35/63] popupMenu: Don't close submenus when activating items

[Jasper St. Pierre <jstpierre src gnome org>]

commit 1b31d0c890b9cf47258a2463c7cbbce5fe15a8a3
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Wed Jun 12 17:38:02 2013 -0400

    popupMenu: Don't close submenus when activating items

 js/ui/popupMenu.js |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 3cee46d..5dafb1a 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -771,7 +771,6 @@ const PopupMenuBase = new Lang.Class({
 
     _subMenuActivated: function() {
         this.emit('activate');
-        this.close(BoxPointer.PopupAnimation.FULL);
     },
 
     _subMenuActiveChanged: function(submenu, submenuItem) {
@@ -806,8 +805,7 @@ const PopupMenuBase = new Lang.Class({
             }
         }));
         menuItem._activateId = menuItem.connect('activate', Lang.bind(this, function (menuItem, event) {
-            this.emit('activate', menuItem);
-            this.close(BoxPointer.PopupAnimation.FULL);
+            this.emit('activate');
         }));
 
         menuItem._parentSensitiveChangeId = this.connect('sensitive-changed', Lang.bind(this, function() {
@@ -1075,6 +1073,9 @@ const PopupMenu = new Lang.Class({
 
         this._openedSubMenu = null;
         this.connect('submenu-open-state-changed', Lang.bind(this, this._subMenuOpenStateChanged));
+        this.connect('activate', Lang.bind(this, function() {
+            this.close(BoxPointer.PopupAnimation.FULL);
+        }));
     },
 
     _subMenuOpenStateChanged: function(menu, submenu, open) {