From 40d6ce1213bbaecc0ecb8a4f56018cd602654de3 Mon Sep 17 00:00:00 2001 From: "sgehani%netscape.com" Date: Thu, 27 Jul 2006 14:55:19 +0000 Subject: [PATCH] Removing a sidebar should select the next one. b=125982; r=gemal; sr=blake; a=asa git-svn-id: svn://10.0.0.236/trunk@204700 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/suite/common/sidebar/customize.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/mozilla/suite/common/sidebar/customize.js b/mozilla/suite/common/sidebar/customize.js index 9601609867e..ad9b2ff954e 100644 --- a/mozilla/suite/common/sidebar/customize.js +++ b/mozilla/suite/common/sidebar/customize.js @@ -237,8 +237,8 @@ function ClickOnOtherPanels(event) treeitem.setAttribute('open','true'); } - link = treeitem.getAttribute('link'); - loaded_link = treeitem.getAttribute('loaded_link'); + var link = treeitem.getAttribute('link'); + var loaded_link = treeitem.getAttribute('loaded_link'); if (link != '' && !loaded_link) { debug("Has remote datasource: "+link); add_datasource_to_other_panels(link); @@ -256,7 +256,7 @@ function add_datasource_to_other_panels(link) { debug("Current URL: " +url); debug("Current link: " +link); - uri = Components.classes['@mozilla.org/network/standard-url;1'].createInstance(); + var uri = Components.classes['@mozilla.org/network/standard-url;1'].createInstance(); uri = uri.QueryInterface(Components.interfaces.nsIURI); uri.spec = url; uri = uri.resolve(link); @@ -430,19 +430,21 @@ function RemovePanel() var tree = document.getElementById('current-panels'); var nextNode = null; - var numSelected = tree.selectedItems.length - while (tree.selectedItems.length > 0) { - var selectedNode = tree.selectedItems[0] + var numToRemove = tree.selectedItems.length; + while (numToRemove > 0) { + var selectedNode = tree.selectedItems[0]; nextNode = selectedNode.nextSibling; if (!nextNode) { nextNode = selectedNode.previousSibling; } - selectedNode.parentNode.removeChild(selectedNode) + selectedNode.parentNode.removeChild(selectedNode); + numToRemove--; } if (nextNode) { tree.selectItem(nextNode) } + enable_buttons_for_current_panels(); }