mozilla-central: changeset 113315:e9c9d1ff7a15dce5c271a4bd63c60a97dbd264af

author	Jared Wein <jwein@mozilla.com>
	Wed, 14 Nov 2012 16:11:09 -0800
changeset 113315	e9c9d1ff7a15dce5c271a4bd63c60a97dbd264af
parent 113314	d3a58eacf6dfe4e939c78883871eaf0cd9704677
child 113316	c62f85640fc362de486ee3776d485cae8a6d4e9c
push id	23869
push user	emorley@mozilla.com
push date	Thu, 15 Nov 2012 16:18:16 +0000
treeherder	mozilla-central@a37525d304d9 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	markh
bugs	808501
milestone	19.0a1
first release with	nightly linux32 58ebb638a7ea / 19.0a1 / 20121116030725 / files nightly linux64 58ebb638a7ea / 19.0a1 / 20121116030725 / files nightly mac 58ebb638a7ea / 19.0a1 / 20121116030725 / files nightly win32 58ebb638a7ea / 19.0a1 / 20121116030725 / files nightly win64 58ebb638a7ea / 19.0a1 / 20121116030725 / files
last release without	nightly linux32 87928cd21b40 / 19.0a1 / 20121114102936 / files nightly linux64 87928cd21b40 / 19.0a1 / 20121114102936 / files nightly mac 87928cd21b40 / 19.0a1 / 20121114102936 / files nightly win32 87928cd21b40 / 19.0a1 / 20121114102936 / files nightly win64 87928cd21b40 / 19.0a1 / 20121114102936 / files

--- a/browser/base/content/browser-social.js
+++ b/browser/base/content/browser-social.js
@@ -249,18 +249,20 @@ let SocialChatBar = {
   update: function() {
     if (!this.isAvailable)
       this.chatbar.removeAll();
     else {
       this.chatbar.hidden = document.mozFullScreen;
     }
   },
   focus: function SocialChatBar_focus() {
+    if (!this.chatbar.selectedChat)
+      return;
     let commandDispatcher = gBrowser.ownerDocument.commandDispatcher;
-    commandDispatcher.advanceFocusIntoSubtree(this.chatbar);
+    commandDispatcher.advanceFocusIntoSubtree(this.chatbar.selectedChat);
   }
 }
 
 function sizeSocialPanelToContent(panel, iframe) {
   // FIXME: bug 764787: Maybe we can use nsIDOMWindowUtils.getRootBounds() here?
   let doc = iframe.contentDocument;
   if (!doc || !doc.body) {
     return;