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

315940 NPOB make adding folders work properly!

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@185228 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
beng%bengoodger.com 2005-11-23 23:48:07 +00:00
parent b1d93cf772
commit 126791d939
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/browser/components/places/content/places.js
View File

@ -112,9 +112,6 @@ var PlacesPage = {
BS.FOLDER_CHILDREN |
BS.QUERY_CHILDREN);
this._places.view = children.QueryInterface(Ci.nsITreeView);
LOG("Roots:");
LOG("Places: " + this._bmsvc.placesRoot + " Menu: " + this._bmsvc.bookmarksRoot + " Toolbar: " + this._bmsvc.placesRoot);
},
uninit: function PP_uninit() {

35
mozilla/browser/components/places/content/places.xml
View File

@ -186,18 +186,31 @@
var rc = selection.getRangeCount();
var min = { }, max = { };
selection.getRangeAt(rc - 1, min, max);
var result = view.QueryInterface(Ci.nsINavHistoryResult);
var lastSelected = result.nodeForTreeIndex(max.value);
// Any visible selected item will always have a parent. The parent of
// an item at the root is the result itself, which can be QI'ed to
// nsINavHistoryResult
var container = lastSelected.parent;
for (var i = 0;
i < container.childCount && container.getChild(i) != lastSelected;
++i);
return { container: 1, index: -1 };
var result = view.QueryInterface(Ci.nsINavHistoryResult);
var container = result;
// When there's no selection, assume the container is the container
// the view is populated from (i.e. the result's folderId).
if (max.value != -1) {
var lastSelected = result.nodeForTreeIndex(max.value);
if (view.isContainer(max.value) && view.isContainerOpen(max.value)) {
// If the last selected item is an open container, append _into_
// it, rather than insert adjacent to it.
container = lastSelected;
max.value = -1;
}
else {
// Any visible selected item will always have a parent. The parent of
// an item at the root is the result itself, which can be QI'ed to
// nsINavHistoryResult
container = lastSelected.parent;
for (var i = 0;
i < container.childCount && container.getChild(i) != lastSelected;
++i);
max.value = i < container.childCount ? i + 1 : i;
}
}
return { container: container.folderId, index: max.value };
]]></getter>
</property>