From e111ac800c4ac2ca8621437e8ae7b3c14a4488b5 Mon Sep 17 00:00:00 2001 From: "silver%warwickcompsoc.co.uk" Date: Tue, 2 Mar 2004 19:41:13 +0000 Subject: [PATCH] Bug 236157 - Make delete-iew/hide-view commands work when deleting a tab to the left of the current one. r=samuel@sieb.net --- extensions/irc/xul/content/commands.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/extensions/irc/xul/content/commands.js b/extensions/irc/xul/content/commands.js index 03dfb0fd7e31..19ebb5b46f5f 100644 --- a/extensions/irc/xul/content/commands.js +++ b/extensions/irc/xul/content/commands.js @@ -1053,13 +1053,15 @@ function cmdDeleteView(e) client.deck.removeChild(e.view.frame); delete e.view.frame; + var oldView = client.currentObject; if (client.currentObject == e.view) { if (i >= client.viewsArray.length) i = client.viewsArray.length - 1; - client.currentObject = null; - setCurrentObject(client.viewsArray[i].source); + oldView = client.viewsArray[i].source } + client.currentObject = null; + setCurrentObject(oldView); } } } @@ -1079,13 +1081,15 @@ function cmdHideView(e) client.deck.removeChild(e.view.frame); delete e.view.frame; + var oldView = client.currentObject; if (client.currentObject == e.view) { if (i >= client.viewsArray.length) i = client.viewsArray.length - 1; - client.currentObject = null; - setCurrentObject (client.viewsArray[i].source); + oldView = client.viewsArray[i].source } + client.currentObject = null; + setCurrentObject(oldView); } } }