mirror of
https://github.com/gryf/pentadactyl-pm.git
synced 2025-12-21 22:27:59 +01:00
use an unordered list rather than a table in the 'activate' help
This commit is contained in:
@@ -281,11 +281,11 @@ function Options() //{{{
|
|||||||
{
|
{
|
||||||
short_help: "Define when tabs are automatically activated",
|
short_help: "Define when tabs are automatically activated",
|
||||||
help: "Available items:<br/>" +
|
help: "Available items:<br/>" +
|
||||||
"<table>" +
|
"<ul>" +
|
||||||
"<tr><td><b>quickmark</b>:</td><td><code class=\"mapping\">go</code> and <code class=\"mapping\">gn</code> mappings</td>" +
|
"<li><b>quickmark</b>: <code class=\"mapping\">go</code> and <code class=\"mapping\">gn</code> mappings</li>" +
|
||||||
"<tr><td><b>tabopen</b>: </td><td><code class=\"command\">:tabopen[!]</code> command</td>" +
|
"<li><b>tabopen</b>: <code class=\"command\">:tabopen[!]</code> command</li>" +
|
||||||
"<tr><td><b>paste</b>: </td><td><code class=\"mapping\">P</code> and <code class=\"mapping\">gP</code> mappings</td>" +
|
"<li><b>paste</b>: <code class=\"mapping\">P</code> and <code class=\"mapping\">gP</code> mappings</li>" +
|
||||||
"</table>",
|
"</ul>",
|
||||||
default_value: "quickmark,tabopen,paste"
|
default_value: "quickmark,tabopen,paste"
|
||||||
}
|
}
|
||||||
));
|
));
|
||||||
|
|||||||
@@ -349,7 +349,7 @@ const vimperator = (function() //{{{
|
|||||||
}
|
}
|
||||||
|
|
||||||
// all other URLs are always loaded in background
|
// all other URLs are always loaded in background
|
||||||
for (var i=1; i < urls.length; i++)
|
for (var i = 1; i < urls.length; i++)
|
||||||
{
|
{
|
||||||
url = typeof urls[i] == "string" ? urls[i] : urls[i][0];
|
url = typeof urls[i] == "string" ? urls[i] : urls[i][0];
|
||||||
postdata = typeof urls[i] == "string" ? null : urls[i][1];
|
postdata = typeof urls[i] == "string" ? null : urls[i][1];
|
||||||
@@ -376,21 +376,21 @@ const vimperator = (function() //{{{
|
|||||||
{
|
{
|
||||||
const nsIAppStartup = Components.interfaces.nsIAppStartup;
|
const nsIAppStartup = Components.interfaces.nsIAppStartup;
|
||||||
|
|
||||||
// Notify all windows that an application quit has been requested.
|
// notify all windows that an application quit has been requested.
|
||||||
var os = Components.classes["@mozilla.org/observer-service;1"]
|
var os = Components.classes["@mozilla.org/observer-service;1"]
|
||||||
.getService(Components.interfaces.nsIObserverService);
|
.getService(Components.interfaces.nsIObserverService);
|
||||||
var cancelQuit = Components.classes["@mozilla.org/supports-PRBool;1"]
|
var cancelQuit = Components.classes["@mozilla.org/supports-PRBool;1"]
|
||||||
.createInstance(Components.interfaces.nsISupportsPRBool);
|
.createInstance(Components.interfaces.nsISupportsPRBool);
|
||||||
os.notifyObservers(cancelQuit, "quit-application-requested", null);
|
os.notifyObservers(cancelQuit, "quit-application-requested", null);
|
||||||
|
|
||||||
// Something aborted the quit process.
|
// something aborted the quit process.
|
||||||
if (cancelQuit.data)
|
if (cancelQuit.data)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// Notify all windows that an application quit has been granted.
|
// notify all windows that an application quit has been granted.
|
||||||
os.notifyObservers(null, "quit-application-granted", null);
|
os.notifyObservers(null, "quit-application-granted", null);
|
||||||
|
|
||||||
// Enumerate all windows and call shutdown handlers
|
// enumerate all windows and call shutdown handlers
|
||||||
var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
|
var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
|
||||||
.getService(Components.interfaces.nsIWindowMediator);
|
.getService(Components.interfaces.nsIWindowMediator);
|
||||||
var windows = wm.getEnumerator(null);
|
var windows = wm.getEnumerator(null);
|
||||||
@@ -626,7 +626,7 @@ const vimperator = (function() //{{{
|
|||||||
vimperator.registerCallback("submit", vimperator.modes.EX, function(command) { vimperator.execute(command); } );
|
vimperator.registerCallback("submit", vimperator.modes.EX, function(command) { vimperator.execute(command); } );
|
||||||
vimperator.registerCallback("complete", vimperator.modes.EX, function(str) { return exTabCompletion(str); } );
|
vimperator.registerCallback("complete", vimperator.modes.EX, function(str) { return exTabCompletion(str); } );
|
||||||
|
|
||||||
//TODO: move most of the following code to Options constructor
|
// TODO: move most of the following code to Options constructor
|
||||||
|
|
||||||
// work around firefox popup blocker
|
// work around firefox popup blocker
|
||||||
popup_allowed_events = Options.getFirefoxPref('dom.popup_allowed_events', 'change click dblclick mouseup reset submit');
|
popup_allowed_events = Options.getFirefoxPref('dom.popup_allowed_events', 'change click dblclick mouseup reset submit');
|
||||||
@@ -652,8 +652,8 @@ const vimperator = (function() //{{{
|
|||||||
// firefox preferences which we need to be changed to work well with vimperator
|
// firefox preferences which we need to be changed to work well with vimperator
|
||||||
Options.setFirefoxPref("browser.startup.page", 3); // start with saved session
|
Options.setFirefoxPref("browser.startup.page", 3); // start with saved session
|
||||||
|
|
||||||
// Finally, read a ~/.vimperatorrc
|
// finally, read a ~/.vimperatorrc
|
||||||
// Make sourcing asynchronous, otherwise commands that open new tabs won't work
|
// make sourcing asynchronous, otherwise commands that open new tabs won't work
|
||||||
setTimeout(function() {
|
setTimeout(function() {
|
||||||
vimperator.source("~/.vimperatorrc", false);
|
vimperator.source("~/.vimperatorrc", false);
|
||||||
vimperator.log("~/.vimperatorrc sourced", 1);
|
vimperator.log("~/.vimperatorrc sourced", 1);
|
||||||
|
|||||||
Reference in New Issue
Block a user