Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 408658 - Info pane should not disappear when changing the info for a bookmark in a query. r=dietrich, a=mconnor.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@241564 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mozilla.mano%sent.com 2007-12-17 22:05:43 +00:00
parent 16982ef761
commit 59b268e88f
1 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
mozilla/browser/components/places/content/treeView.js
View File

@ -298,6 +298,20 @@ PlacesTreeView.prototype = {
var startReplacement = aContainer.viewIndex + 1;
var replaceCount = this._countVisibleRowsForItem(aContainer);
// Persist selection state
var nodesToSelect = [];
var selection = this.selection;
var rc = selection.getRangeCount();
for (var rangeIndex = 0; rangeIndex < rc; rangeIndex++) {
var min = { }, max = { };
selection.getRangeAt(rangeIndex, min, max);
if (min.value > startReplacement + replaceCount)
continue;
for (var nodeIndex = min.value; nodeIndex <= max.value; nodeIndex++)
nodesToSelect.push(this._visibleElements[nodeIndex]);
}
// We don't replace the container item itself so we decrease the
// replaceCount by 1. We don't do so though if there is no visible item
// for the container. This happens when aContainer is the root node and
@ -314,22 +328,6 @@ PlacesTreeView.prototype = {
var toOpenElements = [];
this._buildVisibleSection(aContainer, newElements, toOpenElements, startReplacement);
// Persist selection state
var nodesToSelect = [];
var selection = this.selection;
var rc = selection.getRangeCount();
for (var rangeIndex = 0; rangeIndex < rc; rangeIndex++) {
var min = { }, max = { };
selection.getRangeAt(rangeIndex, min, max);
if (min.value > startReplacement + replaceCount)
continue;
for (var nodeIndex = min.value; nodeIndex <= max.value; nodeIndex++) {
if (newElements.indexOf(this._visibleElements[nodeIndex]) != -1)
nodesToSelect.push(this._visibleElements[nodeIndex]);
}
}
// actually update the visible list
this._visibleElements =
this._visibleElements.slice(0, startReplacement).concat(newElements)
@ -377,7 +375,29 @@ PlacesTreeView.prototype = {
if (nodesToSelect.length > 0) {
for each (var node in nodesToSelect) {
var index = node.viewIndex;
selection.rangedSelect(index, index, true);
// if the same node was used (happens on sorting-changes),
// just use viewIndex
if (index == -1) { // otherwise, try to find an equal node
var itemId = node.itemId;
if (itemId != 1) { // bookmark-nodes in queries case
for (i=0; i < newElements.length && index == -1; i++) {
if (newElements[i].itemId == itemId)
index = newElements[i].viewIndex;
}
}
else { // history nodes
var uri = node.uri;
if (uri) {
for (i=0; i < newElements.length && index == -1; i++) {
if (newElements[i].uri == uri)
index = newElements[i].viewIndex;
}
}
}
}
if (index != -1)
selection.rangedSelect(index, index, true);
}
selection.selectEventsSuppressed = false;
}