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

minor improvements to search string heuristic regexps in toURLArray

Browse Source
This commit is contained in:
Doug Kearns
2007-08-19 14:15:33 +00:00
parent 86913712ed
commit 44c2817743
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
chrome/content/vimperator/commands.js
View File

@@ -1248,6 +1248,9 @@ String.prototype.toURLArray = function() // {{{
var new_url = vimperator.buffer.URL; var new_url = vimperator.buffer.URL;
var matches; var matches;
// strip each 'URL' - makes things simpler later on
urls[url] = urls[url].replace(/^\s+/, '').replace(/\s+$/, '');
// FIXME: not really that good (doesn't handle .. in the middle) // FIXME: not really that good (doesn't handle .. in the middle)
// check for ./ and ../ (or even .../) to go to a file in the upper directory // check for ./ and ../ (or even .../) to go to a file in the upper directory
if (matches = urls[url].match(/^(?:\.$|\.\/(\S*))/)) if (matches = urls[url].match(/^(?:\.$|\.\/(\S*))/))
@@ -1270,21 +1273,23 @@ String.prototype.toURLArray = function() // {{{
continue; continue;
} }
/* if the string contains a space or does not contain any of: .:/ // if the string doesn't look like a valid URL (i.e. contains a space
* open it with default search engine */ // or does not contain any of: .:/) try opening it with a search engine
if (urls[url].match(/\s+/) || urls[url].match(/\.|:|\//) == null) // or keyword bookmark
if (/\s/.test(urls[url]) || !/[.:\/]/.test(urls[url]))
{ {
matches = urls[url].match(/^(\S+)(?:\s+(.+))?$/)
var alias = matches[1];
var text = matches[2] ? matches[2] : null;
// TODO: it would be clearer if the appropriate call to
// getSearchURL was made based on whether or not the first word was
// indeed an SE alias rather than seeing if getSearchURL can
// process the call usefully and trying again if it fails - much
// like the comments below ;-)
// check if the first word is a search engine // check if the first word is a search engine
var alias = null;
var text = null;
matches = urls[url].match(/^\s*(.*?)(\s+|$)(.*)/);
if (matches && matches[1])
alias = matches[1];
if (matches && matches[3] && matches[3].length >= 1)
text = matches[3];
var search_url = vimperator.bookmarks.getSearchURL(text, alias); var search_url = vimperator.bookmarks.getSearchURL(text, alias);
if (search_url/* && search_url.length >= 1*/) if (search_url/* && search_url.length >= 1*/)
{ {
@@ -1306,7 +1311,6 @@ String.prototype.toURLArray = function() // {{{
// something useful with it :) // something useful with it :)
} }
vimperator.log(urls)
return urls; return urls;
} // }}} } // }}}