[gnome-shell/gnome-3-8] messageTray: Ensure notifications are focused after they are expanded

[Ray Strode <halfline src gnome org>]

commit 4a5e2765516440469fadec7cda0e5b9f0ac8756f
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Fri Jun 21 15:24:50 2013 -0400

    messageTray: Ensure notifications are focused after they are expanded
    
    If we focus notifications before they're expanded, the body and action
    area won't be visible, and the can_focus members like the text entry
    will not be able to be focused.
    
    Ensure that all of the all actors that would be in an expanded notification
    are visible before we attempt to focus them.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=698778

 js/ui/messageTray.js |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index 7349961..41903ce 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -2604,16 +2604,16 @@ const MessageTray = new Lang.Class({
     },
 
     _expandNotification: function(autoExpanding) {
-        // Don't focus notifications that are auto-expanding.
-        if (!autoExpanding)
-            this._ensureNotificationFocused();
-
         if (!this._notificationExpandedId)
             this._notificationExpandedId =
                 this._notification.connect('expanded',
                                            Lang.bind(this, this._onNotificationExpanded));
         // Don't animate changes in notifications that are auto-expanding.
         this._notification.expand(!autoExpanding);
+
+        // Don't focus notifications that are auto-expanding.
+        if (!autoExpanding)
+            this._ensureNotificationFocused();
     },
 
     _onNotificationExpanded: function() {