gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-23 20:52:26 +01:00
Code Issues Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
Kris Maglione
2008-09-18 14:10:02 +00:00
parent 7532d5b50b
commit d8741b5140
3 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
content/liberator.js
View File

@@ -1080,7 +1080,9 @@ const liberator = (function () //{{{
{ {
var files = liberator.io.readDirectory(pluginDir.path); var files = liberator.io.readDirectory(pluginDir.path);
liberator.log("Sourcing plugin directory...", 3); liberator.log("Sourcing plugin directory...", 3);
files.sort(function (a, b) String(a.path).localeCompare(b.path)).forEach(function (file) { files.sort(function (a, b) String.localeCompare(a.path, b.path))
.forEach(function (file)
{
if (!file.isDirectory() && /\.(js|vimp)$/i.test(file.path)) if (!file.isDirectory() && /\.(js|vimp)$/i.test(file.path))
liberator.io.source(file.path, false); liberator.io.source(file.path, false);
}); });

17
content/ui.js
View File

@@ -707,16 +707,7 @@ liberator.CommandLine = function () //{{{
// sort the completion list // sort the completion list
if (/\bsort\b/.test(liberator.options["wildoptions"])) if (/\bsort\b/.test(liberator.options["wildoptions"]))
{ completions.sort(function (a, b) String.localeCompare(a[0], b[0]));
completions.sort(function (a, b) {
if (a[0] < b[0])
return -1;
else if (a[0] > b[0])
return 1;
else
return 0;
});
}
if (hasList) if (hasList)
completionList.setItems(completions, -1); completionList.setItems(completions, -1);
@@ -1312,7 +1303,7 @@ liberator.ItemList = function (id) //{{{
clear: function () { this.setItems([]); doc.body.innerHTML = ""; }, clear: function () { this.setItems([]); doc.body.innerHTML = ""; },
hide: function () { container.collapsed = true; }, hide: function () { container.collapsed = true; },
show: function () { container.collapsed = false; }, show: function () { container.collapsed = false; this.selectItem(0); /* fixme? */ },
visible: function () { return !container.collapsed; }, visible: function () { return !container.collapsed; },
setItems: function (items, selectedItem) setItems: function (items, selectedItem)
@@ -1478,9 +1469,7 @@ liberator.StatusLine = function () //{{{
} }
else else
{ {
var matches = url.match(/^chrome:\/\/vimperator\/locale\/(\S+)$/); url = url.replace(new RegExp("^chrome://" + liberator.config.name.toLowerCase() + "/locale/(\\S+)\\.html$"), "$1 [Help]");
if (matches && matches[1])
url = matches[1] + " [Help]";
} }
// when session information is available, add [+] when we can go backwards // when session information is available, add [+] when we can go backwards

14
content/util.js
View File

@@ -287,14 +287,18 @@ liberator.util = { //{{{
{ {
var urls = str.split(new RegExp("\s*" + liberator.options["urlseparator"] + "\s*")); var urls = str.split(new RegExp("\s*" + liberator.options["urlseparator"] + "\s*"));
begin: for (let url = 0; url < urls.length; url++) for (let url = 0; url < urls.length; url++)
{ {
var file = liberator.io.getFile(urls[url]); try
if (file.exists() && file.isReadable())
{ {
urls[url] = file.path; var file = liberator.io.getFile(urls[url]);
continue; if (file.exists() && file.isReadable())
{
urls[url] = file.path;
continue;
}
} }
catch (e) {}
// strip each 'URL' - makes things simpler later on // strip each 'URL' - makes things simpler later on
urls[url] = urls[url].replace(/^\s+/, "").replace(/\s+$/, ""); urls[url] = urls[url].replace(/^\s+/, "").replace(/\s+$/, "");