[gnome-shell/wip/aggregate-menu: 4/57] popupMenu: Fix closing submenus when clicking on the expander

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

commit 615b1a4f69d284999bc3c95fc8e63c9cc617f044
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Mon Jul 15 19:38:05 2013 -0400

    popupMenu: Fix closing submenus when clicking on the expander
    
    We need to make sure that we reset the opened submenu when we close the
    submenu, not trick the toplevel into thinking a closed submenu is the
    currently opened menu.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=704336

 js/ui/popupMenu.js |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 9068060..9a4ea6a 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -1367,12 +1367,13 @@ const PopupSubMenuMenuItem = new Lang.Class({
     },
 
     _subMenuOpenStateChanged: function(menu, open) {
-        if (open)
+        if (open) {
             this.actor.add_style_pseudo_class('open');
-        else
+            this._getTopMenu()._setOpenedSubMenu(this.menu);
+        } else {
             this.actor.remove_style_pseudo_class('open');
-
-        this._getTopMenu()._setOpenedSubMenu(this.menu);
+            this._getTopMenu()._setOpenedSubMenu(null);
+        }
     },
 
     destroy: function() {