From a981d542db9d879a4ac857f77e308fede68fd1f4 Mon Sep 17 00:00:00 2001 From: Wes Kocher Date: Fri, 21 Nov 2014 10:54:36 -0800 Subject: [PATCH] Backed out changeset a7621853f055 (bug 1100284) for xpcshell bustage --- browser/base/content/socialchat.xml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/browser/base/content/socialchat.xml b/browser/base/content/socialchat.xml index d53427adb45e..63808225ab42 100644 --- a/browser/base/content/socialchat.xml +++ b/browser/base/content/socialchat.xml @@ -193,9 +193,6 @@ () => { this.swapDocShells(cb); - chatbar.focus(); - this.close(); - // chatboxForURL is a map of URL -> chatbox used to avoid opening // duplicate chat windows. Ensure reattached chat windows aren't // registered with about:blank as their URL, otherwise reattaching @@ -203,6 +200,8 @@ chatbar.chatboxForURL.delete("about:blank"); chatbar.chatboxForURL.set(this.src, Cu.getWeakReference(cb)); + chatbar.focus(); + this.close(); deferred.resolve(cb); } ); @@ -528,9 +527,7 @@ let cb = this.chatboxForURL.get(aURL); if (cb) { cb = cb.get(); - // A chatbox is still alive to us when it's parented and still has - // content. - if (cb.parentNode && cb.contentWindow) { + if (cb.parentNode) { this.showChat(cb, aMode); if (aCallback) { if (cb._callbacks == null) { @@ -649,7 +646,6 @@