1
0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-17 07:35:44 +01:00

Added Ctrl-[ alias, and 's' guioption

This commit is contained in:
Martin Stubenschrott
2007-04-16 23:31:55 +00:00
parent 6797ee2cfb
commit 849789d23d
9 changed files with 13 additions and 7 deletions

View File

@@ -634,7 +634,7 @@ var g_mappings = [/*{{{*/
function(count) { openVimperatorBar(null); }
],
[
["<Esc>"],
["<Esc>", "<C-[>"],
"Cancel any operation",
"Stops loading the current webpage and exits any command line or hint mode.<br>"+
"Also focuses the web page, in case a form field has focus, and eats our key presses.",

View File

@@ -110,7 +110,7 @@ var g_settings = [/*{{{*/
[
["guioptions", "go"],
"Shows or hides the menu, toolbar and scrollbars",
"Supported characters:<br><ul><li><b>m</b>: menubar</li><li><b>T</b>: toolbar</ul>",
"Supported characters:<br><ul><li><b>m</b>: menubar</li><li><b>T</b>: toolbar<li><b>b</b>: bookmark bar</li><li><b>s</b>: original Firefox statusbar</ul>",
function(value) { set_pref("guioptions", value); set_guioptions(value); },
function() { return get_pref("guioptions"); },
"charlist",
@@ -334,8 +334,8 @@ function set_guioptions(value)
document.getElementById("PersonalToolbar").collapsed = value.indexOf("b") > -1 ? false : true;
document.getElementById("PersonalToolbar").hidden = value.indexOf("b") > -1 ? false : true;
// and original status bar (default), but show it, e.g. when needed for extensions
document.getElementById("status-bar").collapsed = value.indexOf("S") > -1 ? false : true;
document.getElementById("status-bar").hidden = value.indexOf("S") > -1 ? false : true;
document.getElementById("status-bar").collapsed = value.indexOf("s") > -1 ? false : true;
document.getElementById("status-bar").hidden = value.indexOf("s") > -1 ? false : true;
}
function set_showtabline(value)

View File

@@ -496,7 +496,6 @@ function onCommandBarKeypress(evt)/*{{{*/
else
special = false;
/* user pressed ENTER to carry out a command */
if (evt.keyCode == KeyEvent.DOM_VK_RETURN)
{
@@ -507,7 +506,8 @@ function onCommandBarKeypress(evt)/*{{{*/
execute_command(count, cmd, special, args);
}
else if (evt.keyCode == KeyEvent.DOM_VK_ESCAPE)
else if ((evt.keyCode == KeyEvent.DOM_VK_ESCAPE) ||
(keyToString(evt) == "<C-[>"))
{
add_to_command_history(command);
focusContent(true, true);

View File

@@ -88,6 +88,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
<keyset id="mainKeyset">
<key id="key_open_vimbar" key=":" oncommand="openVimperatorBar();" modifiers=""/>
<key id="key_stop" keycode="VK_ESCAPE" oncommand="onEscape();"/>
<!--key id="key_cancel" keycode="[" modifiers="control" oncommand="onEscape();"/-->
<!-- other keys are handled inside vimperator.js event loop -->
</keyset>