mirror of
https://github.com/gryf/pentadactyl-pm.git
synced 2025-12-21 20:27:58 +01:00
updated history service to use Places
This commit is contained in:
@@ -71,10 +71,9 @@ function Bookmarks() //{{{
|
|||||||
|
|
||||||
folders.shift();
|
folders.shift();
|
||||||
// iterate over the immediate children of this folder
|
// iterate over the immediate children of this folder
|
||||||
for (var i = 0; i < rootNode.childCount; i ++)
|
for (var i = 0; i < rootNode.childCount; i++)
|
||||||
{
|
{
|
||||||
var node = rootNode.getChild(i);
|
var node = rootNode.getChild(i);
|
||||||
//dump("Child " + node.itemId + ": " + node.title + " - " + node.type + "\n");
|
|
||||||
if (node.type == node.RESULT_TYPE_FOLDER) // folder
|
if (node.type == node.RESULT_TYPE_FOLDER) // folder
|
||||||
folders.push(node.itemId);
|
folders.push(node.itemId);
|
||||||
else if (node.type == node.RESULT_TYPE_URI) // bookmark
|
else if (node.type == node.RESULT_TYPE_URI) // bookmark
|
||||||
@@ -346,11 +345,8 @@ function History() //{{{
|
|||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
////////////////////// PRIVATE SECTION /////////////////////////////////////////
|
////////////////////// PRIVATE SECTION /////////////////////////////////////////
|
||||||
/////////////////////////////////////////////////////////////////////////////{{{
|
/////////////////////////////////////////////////////////////////////////////{{{
|
||||||
|
const history_service = Components.classes["@mozilla.org/browser/nav-history-service;1"]
|
||||||
const rdf_service = Components.classes["@mozilla.org/rdf/rdf-service;1"].
|
.getService(Components.interfaces.nsINavHistoryService);
|
||||||
getService( Components.interfaces.nsIRDFService );
|
|
||||||
// const global_history_service = Components.classes["@mozilla.org/browser/global-history;2"].
|
|
||||||
// getService(Components.interfaces.nsIRDFDataSource);
|
|
||||||
|
|
||||||
var history = null;
|
var history = null;
|
||||||
|
|
||||||
@@ -361,40 +357,29 @@ function History() //{{{
|
|||||||
{
|
{
|
||||||
history = [];
|
history = [];
|
||||||
|
|
||||||
// var historytree = document.getElementById("hiddenHistoryTree");
|
// no query parameters will get all history
|
||||||
// if (!historytree)
|
// XXX default sorting is... ?
|
||||||
// return;
|
var options = history_service.getNewQueryOptions();
|
||||||
//
|
var query = history_service.getNewQuery();
|
||||||
// if (historytree.hidden)
|
|
||||||
// {
|
// execute the query
|
||||||
// historytree.hidden = false;
|
var result = history_service.executeQuery(query, options);
|
||||||
// historytree.database.AddDataSource(global_history_service);
|
var rootNode = result.root;
|
||||||
// }
|
rootNode.containerOpen = true;
|
||||||
//
|
// iterate over the immediate children of this folder
|
||||||
// if (!historytree.ref)
|
for (var i = 0; i < rootNode.childCount; i++)
|
||||||
// historytree.ref = "NC:HistoryRoot";
|
{
|
||||||
//
|
var node = rootNode.getChild(i);
|
||||||
// var nameResource = rdf_service.GetResource(gNC_NS + "Name");
|
if (node.type == node.RESULT_TYPE_URI) // just make sure it's a bookmark
|
||||||
// var builder = historytree.builder.QueryInterface(Components.interfaces.nsIXULTreeBuilder);
|
{
|
||||||
//
|
history.push([node.uri, node.title]);
|
||||||
// var count = historytree.view.rowCount;
|
}
|
||||||
// for (var i = count - 1; i >= 0; i--)
|
else
|
||||||
// {
|
dump("History child " + node.itemId + ": " + node.title + " - " + node.type + "\n");
|
||||||
// var res = builder.getResourceAtIndex(i);
|
}
|
||||||
// var url = res.Value;
|
|
||||||
// var title;
|
// close a container after using it!
|
||||||
// var titleRes = historytree.database.GetTarget(res, nameResource, true);
|
rootNode.containerOpen = false;
|
||||||
// if (!titleRes)
|
|
||||||
// continue;
|
|
||||||
//
|
|
||||||
// var titleLiteral = titleRes.QueryInterface(Components.interfaces.nsIRDFLiteral);
|
|
||||||
// if (titleLiteral)
|
|
||||||
// title = titleLiteral.Value;
|
|
||||||
// else
|
|
||||||
// title = "";
|
|
||||||
//
|
|
||||||
// history.push([url, title]);
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////}}}
|
/////////////////////////////////////////////////////////////////////////////}}}
|
||||||
|
|||||||
Reference in New Issue
Block a user