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

improve toURLArray so that it can handle trailing /'s in its args - "gu" and

Browse Source 
:open should now behave as specified
This commit is contained in:
Doug Kearns
2007-08-18 15:26:28 +00:00
parent e58cbc89fe
commit 12d4efde86
1 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1245,39 +1245,28 @@ String.prototype.toURLArray = function() // {{{
begin: for (var url = 0; url < urls.length; url++) begin: for (var url = 0; url < urls.length; url++)
{ {
var newLocation = vimperator.buffer.URL; var new_url = vimperator.buffer.URL;
var matches;
// FIXME: classic '10 second hack' to fix "gu" foobar//../ problem // FIXME: not really that good (doesn't handle .. in the middle)
newLocation = newLocation.replace(/\/+$/, '');
// FIXME: not really that good (doesn't handle .. in the middle), also problems with trailing slashes
// 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 (urls[url].match(/^(\.$|\.\/\S*)/))
{ {
newLocation = newLocation.replace(/([\s\S]+\/)[^\/]*/, "$1"); var tail = matches[1] ? matches[1] : "";
if (urls[url].match(/^\.(\/\S+)/)) urls[url] = new_url.replace(/(.+\/)[^\/]*/, "$1" + tail); // NOTE: escape / in character sets so as not to break Vim syntax highlighting
newLocation += urls[url].replace(/^\.(\/\S+)/, "$1");
urls[url] = newLocation;
continue; continue;
} }
else if (urls[url].match(/^(\.\.$|\.\.\/[\S]*)/)) else if (matches = urls[url].match(/^(?:\.\.$|\.\.\/(\S*))/))
{ {
newLocation = newLocation.replace(/([\s\S]+\/)[^\/]*/, "$1/../"); var tail = matches[1] ? matches[1] : "";
if (urls[url].match(/^\.\.(\/\S+)/)) urls[url] = new_url.replace(/(.+\/)[^\/]*/, "$1../" + tail);
newLocation += urls[url].replace(/^\.\.\/(\S+)/, "$1");
urls[url] = newLocation;
continue; continue;
} }
else if (urls[url].match(/^(\.\.\.$|\.\.\.\/[\S]*)/)) else if (matches = urls[url].match(/^(?:\.\.\.$|\.\.\.\/(\S*))/))
{ {
newLocation = newLocation.replace(/([\s\S]+):\/\/\/?(\S+?)\/\S*/, "$1://$2/"); var location = window.content.document.location;
if (urls[url].match(/^\.\.\.(\/\S+)/)) var tail = matches[1] ? matches[1] : "";
newLocation += urls[url].replace(/^\.\.\.\/(\S+)/, "$1"); urls[url] = location.protocol + "//" + location.host + "/" + tail
urls[url] = newLocation;
continue; continue;
} }
@@ -1286,9 +1275,11 @@ String.prototype.toURLArray = function() // {{{
if (urls[url].match(/\s+/) || urls[url].match(/\.|:|\//) == null) if (urls[url].match(/\s+/) || urls[url].match(/\.|:|\//) == null)
{ {
// check if the first word is a search engine // check if the first word is a search engine
var matches = urls[url].match(/^\s*(.*?)(\s+|$)(.*)/);
var alias = null; var alias = null;
var text = null; var text = null;
matches = urls[url].match(/^\s*(.*?)(\s+|$)(.*)/);
if (matches && matches[1]) if (matches && matches[1])
alias = matches[1]; alias = matches[1];
if (matches && matches[3] && matches[3].length >= 1) if (matches && matches[3] && matches[3].length >= 1)
@@ -1315,6 +1306,7 @@ String.prototype.toURLArray = function() // {{{
// something useful with it :) // something useful with it :)
} }
vimperator.log(urls)
return urls; return urls;
} // }}} } // }}}