From 39ad2d9c0cf226646e3b7ce58b9eefb239233bd4 Mon Sep 17 00:00:00 2001 From: Martin Stubenschrott Date: Sat, 16 Aug 2008 10:16:53 +0000 Subject: [PATCH] fixed :history --- content/bookmarks.js | 11 ++++------- content/events.js | 2 +- content/muttator.js | 4 ++-- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/content/bookmarks.js b/content/bookmarks.js index 2bbdbf0a..aec72488 100644 --- a/content/bookmarks.js +++ b/content/bookmarks.js @@ -505,12 +505,9 @@ liberator.History = function () //{{{ for (var i = 0; i < rootNode.childCount; i++) { var node = rootNode.getChild(i); + dump("History child " + node.itemId + ": " + node.title + " - " + node.type + "\n"); if (node.type == node.RESULT_TYPE_URI) // just make sure it's a bookmark - { - history.push([node.uri, node.title]); - } - else - dump("History child " + node.itemId + ": " + node.title + " - " + node.type + "\n"); + history.push([node.uri, node.title || "[No title]"]); } // close a container after using it! @@ -655,7 +652,7 @@ liberator.History = function () //{{{ if (!history) load(); - return liberator.completion.filterURLArray(history, filter); + return liberator.completion.filterURLArray(history, filter); }, // the history is automatically added to the Places global history @@ -669,7 +666,7 @@ liberator.History = function () //{{{ return elem[0] != url; }); - history.unshift([url, title]); + history.unshift([url, title || "[No title]"]); return true; }, diff --git a/content/events.js b/content/events.js index e5272f9e..fb3669df 100644 --- a/content/events.js +++ b/content/events.js @@ -452,7 +452,7 @@ liberator.Events = function () //{{{ var url = doc.defaultView.location.href; var title = doc.defaultView.title; - //update history + // update history if (url && liberator.history) liberator.history.add(url, title); diff --git a/content/muttator.js b/content/muttator.js index b4f86a9c..c77eec5d 100644 --- a/content/muttator.js +++ b/content/muttator.js @@ -98,12 +98,12 @@ liberator.config = { //{{{ ], // they are sorted by relevance, not alphabetically - helpFiles: ["intro.html", "tutorial.html", "starting.html", + helpFiles: ["intro.html"],/* "tutorial.html", "starting.html", "browsing.html", "buffer.html", "pattern.html", "options.html", "tabs.html", "hints.html", "map.html", "eval.html", "marks.html", "repeat.html", "autocommands.html", "print.html", "developer.html", "various.html" - ], + ],*/ init: function () {