gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-01-29 08:45:47 +01:00
Code Issues Projects Releases Wiki Activity

sort QuickMarks as [a-z][A-Z][0-9] in :qmarks output

Browse Source
This commit is contained in:
Doug Kearns
2008-08-30 14:57:17 +00:00
parent 76eeab461e
commit 8742e8050b
1 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
content/bookmarks.js
View File

@@ -775,7 +775,7 @@ liberator.QuickMarks = function () //{{{
// TODO: move to a storage module // TODO: move to a storage module
var savedMarks = liberator.options.getPref("extensions.vimperator.quickmarks", "").split("\n"); var savedMarks = liberator.options.getPref("extensions.vimperator.quickmarks", "").split("\n");
// load the saved quickmarks -- TODO: change to sqlite // load the saved quickmarks
for (var i = 0; i < savedMarks.length - 1; i += 2) for (var i = 0; i < savedMarks.length - 1; i += 2)
{ {
qmarks[savedMarks[i]] = savedMarks[i + 1]; qmarks[savedMarks[i]] = savedMarks[i + 1];
@@ -830,6 +830,7 @@ liberator.QuickMarks = function () //{{{
liberator.echoerr("E471: Argument required"); liberator.echoerr("E471: Argument required");
return; return;
} }
if (special && args) if (special && args)
{ {
liberator.echoerr("E474: Invalid argument"); liberator.echoerr("E474: Invalid argument");
@@ -860,7 +861,7 @@ liberator.QuickMarks = function () //{{{
"Show all QuickMarks", "Show all QuickMarks",
function (args) function (args)
{ {
// ignore invalid mark characters unless there are no valid mark chars // ignore invalid qmark characters unless there are no valid qmark chars
if (args && !/[a-zA-Z0-9]/.test(args)) if (args && !/[a-zA-Z0-9]/.test(args))
{ {
liberator.echoerr("E283: No QuickMarks matching \"" + args + "\""); liberator.echoerr("E283: No QuickMarks matching \"" + args + "\"");
@@ -910,12 +911,21 @@ liberator.QuickMarks = function () //{{{
list: function (filter) list: function (filter)
{ {
var marks = []; var lowercaseMarks = [];
var uppercaseMarks = [];
var numberMarks = [];
// TODO: should we sort these in a-zA-Z0-9 order? for (var qmark in qmarks)
for (var mark in qmarks) {
marks.push([mark, qmarks[mark]]); if (/[a-z]/.test(qmark))
marks.sort(); lowercaseMarks.push(qmark);
else if (/[A-Z]/.test(qmark))
uppercaseMarks.push(qmark);
else
numberMarks.push(qmark);
}
var marks = lowercaseMarks.sort().concat(uppercaseMarks.sort()).concat(numberMarks.sort());
if (marks.length == 0) if (marks.length == 0)
{ {
@@ -925,10 +935,11 @@ liberator.QuickMarks = function () //{{{
if (filter.length > 0) if (filter.length > 0)
{ {
marks = marks.filter(function (mark) { marks = marks.filter(function (qmark) {
if (filter.indexOf(mark[0]) > -1) if (filter.indexOf(qmark) > -1)
return mark; return qmark;
}); });
if (marks.length == 0) if (marks.length == 0)
{ {
liberator.echoerr("E283: No QuickMarks matching \"" + filter + "\""); liberator.echoerr("E283: No QuickMarks matching \"" + filter + "\"");
@@ -938,11 +949,13 @@ liberator.QuickMarks = function () //{{{
var list = ":" + liberator.util.escapeHTML(liberator.commandline.getCommand()) + "<br/>" + var list = ":" + liberator.util.escapeHTML(liberator.commandline.getCommand()) + "<br/>" +
"<table><tr align=\"left\" class=\"hl-Title\"><th>QuickMark</th><th>URL</th></tr>"; "<table><tr align=\"left\" class=\"hl-Title\"><th>QuickMark</th><th>URL</th></tr>";
for (var i = 0; i < marks.length; i++) for (var i = 0; i < marks.length; i++)
{ {
list += "<tr><td> " + marks[i][0] + list += "<tr><td> " + marks[i] +
"</td><td style=\"color: green;\">" + liberator.util.escapeHTML(marks[i][1]) + "</td></tr>"; "</td><td style=\"color: green;\">" + liberator.util.escapeHTML(qmarks[marks[i]]) + "</td></tr>";
} }
list += "</table>"; list += "</table>";
liberator.commandline.echo(list, liberator.commandline.HL_NORMAL, liberator.commandline.FORCE_MULTILINE); liberator.commandline.echo(list, liberator.commandline.HL_NORMAL, liberator.commandline.FORCE_MULTILINE);