1
0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-21 22:17:59 +01:00

changed '|' to ', ' as a url separator

This commit is contained in:
Martin Stubenschrott
2007-07-04 13:32:34 +00:00
parent 384d359749
commit 5775aaaff5
4 changed files with 7 additions and 4 deletions

View File

@@ -1,6 +1,7 @@
<pre> <pre>
2007-07-02: 2007-07-02:
* version ??? * version ???
* Changed "|" to ", " as a url seperator in :open
* Ctrl-^ mapping for selecting the alternate tab/buffer * Ctrl-^ mapping for selecting the alternate tab/buffer
* QuickMarks support (new commands :qmarks/:qmarkadd/:qmarkdel and * QuickMarks support (new commands :qmarks/:qmarkadd/:qmarkdel and
mappings go{a-z}, gn{a-z} and M{a-z} mappings go{a-z}, gn{a-z} and M{a-z}

View File

@@ -569,8 +569,8 @@ function Commands() //{{{
{ {
usage: ["o[pen] [url] [| url]"], usage: ["o[pen] [url] [| url]"],
short_help: "Open one or more URLs in the current tab", short_help: "Open one or more URLs in the current tab",
help: "Multiple URLs can be separated with the | character.<br/>" + help: "Multiple URLs can be separated with \", \". Note that the space after the comma is required.<br/>" +
"Each |-separated token is analyzed and in this order:<br/>" + "Each token is analyzed and in this order:<br/>" +
"<ol>" + "<ol>" +
"<li>Transformed to a relative URL of the current location if it starts with . or .. or ...;<br/>" + "<li>Transformed to a relative URL of the current location if it starts with . or .. or ...;<br/>" +
"... is special and moves up the directory hierarchy as far as possible." + "... is special and moves up the directory hierarchy as far as possible." +
@@ -581,7 +581,7 @@ function Commands() //{{{
"will open the wikipedia entry for linux torvalds).</li>" + "will open the wikipedia entry for linux torvalds).</li>" +
" <li>Opened with the default search engine or keyword (specified with the <code class=\"option\">'defsearch'</code> option) " + " <li>Opened with the default search engine or keyword (specified with the <code class=\"option\">'defsearch'</code> option) " +
"if the first word is no search engine (<code class=\"command\">:open linus torvalds</code> will open a google search for linux torvalds).</li>" + "if the first word is no search engine (<code class=\"command\">:open linus torvalds</code> will open a google search for linux torvalds).</li>" +
" <li>Passed directly to Firefox in all other cases (<code class=\"command\">:open www.osnews.com | www.slashdot.org</code> will " + " <li>Passed directly to Firefox in all other cases (<code class=\"command\">:open www.osnews.com, www.slashdot.org</code> will " +
"open OSNews in the current, and Slashdot in a new background tab).</li>" + "open OSNews in the current, and Slashdot in a new background tab).</li>" +
"</ol>" + "</ol>" +
"You WILL be able to use <code class=\"command\">:open [-T \"linux\"] torvalds&lt;Tab&gt;</code> to complete bookmarks " + "You WILL be able to use <code class=\"command\">:open [-T \"linux\"] torvalds&lt;Tab&gt;</code> to complete bookmarks " +
@@ -1088,7 +1088,7 @@ function openURLsInNewTab(str, activate)
*/ */
function stringToURLs(str) function stringToURLs(str)
{ {
var urls = str.split(/\s*\|\s*/); var urls = str.split(/\s*\,\s+/);
begin: for (var url = 0; url < urls.length; url++) begin: for (var url = 0; url < urls.length; url++)
{ {
// 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

View File

@@ -466,6 +466,7 @@ function Events() //{{{
// return false; // return false;
// vimperator.logObject(event); // vimperator.logObject(event);
var key = event.toString() var key = event.toString()
// alert(key);
if (!key) if (!key)
return false; return false;
// event.stopPropagation(); // event.stopPropagation();

View File

@@ -108,6 +108,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
<keyset id="mainKeyset"> <keyset id="mainKeyset">
<key id="key_open_vimbar" key=":" oncommand="vimperator.commandline.open(':', '', MODE_EX);" modifiers=""/> <key id="key_open_vimbar" key=":" oncommand="vimperator.commandline.open(':', '', MODE_EX);" modifiers=""/>
<key id="key_stop" keycode="VK_ESCAPE" oncommand="vimperator.events.onEscape();"/> <key id="key_stop" keycode="VK_ESCAPE" oncommand="vimperator.events.onEscape();"/>
<!--key id="key_a" key="a" oncommand="alert('a'); scrollBufferRelative(0, 1);"!/-->
<!-- other keys are handled inside vimperator.js event loop --> <!-- other keys are handled inside vimperator.js event loop -->
</keyset> </keyset>
</window> </window>