gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-01-01 06:02:27 +01:00
Code Issues Projects Releases Wiki Activity

Only show "Waiting..." message if wed otherwise show items (should maybe do the same for context.message); prefix window functions with "window."; general cleanup.

Browse Source
This commit is contained in:
Kris Maglione
2008-12-01 07:37:35 +00:00
parent caa59fec00
commit 42bbfd2500
15 changed files with 235 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
content/util.js
View File

@@ -465,30 +465,26 @@ const util = { //{{{
{
let urls = str.split(new RegExp("\s*" + options["urlseparator"] + "\s*"));
for (let url = 0; url < urls.length; url++)
{
return urls.map(function (url) {
try
{
let file = io.getFile(urls[url]);
let file = io.getFile(url);
if (file.exists() && file.isReadable())
{
urls[url] = file.path;
continue;
}
return file.path;
}
catch (e) {}
// removes spaces from the string if it starts with http:// or something like that
if (/^\w+:\/\//.test(urls[url]))
urls[url] = urls[url].replace(/\s+/g, "");
if (/^\w+:\/\//.test(url))
url = url.replace(/\s+/g, "");
// strip each 'URL' - makes things simpler later on
urls[url] = urls[url].replace(/^\s+/, "").replace(/\s+$/, "");
url = url.replace(/^\s+|\s+$/, "");
// if the string doesn't look like a valid URL (i.e. contains a space
// or does not contain any of: .:/) try opening it with a search engine
// or keyword bookmark
if (/\s/.test(urls[url]) || !/[.:\/]/.test(urls[url]))
if (/\s/.test(url) || !/[.:\/]/.test(url))
{
// TODO: it would be clearer if the appropriate call to
// getSearchURL was made based on whether or not the first word was
@@ -497,27 +493,22 @@ const util = { //{{{
// like the comments below ;-)
// check for a search engine match in the string
let searchURL = bookmarks.getSearchURL(urls[url], false);
let searchURL = bookmarks.getSearchURL(url, false);
if (searchURL)
{
urls[url] = searchURL;
continue;
return searchURL;
}
else // no search engine match, search for the whole string in the default engine
{
searchURL = bookmarks.getSearchURL(urls[url], true);
searchURL = bookmarks.getSearchURL(url, true);
if (searchURL)
{
urls[url] = searchURL;
continue;
}
return searchURL;
}
}
// if we are here let Firefox handle the url and hope it does
// something useful with it :)
}
return urls;
return url;
});
},
xmlToDom: function xmlToDom(node, doc, nodes)