mirror of
https://github.com/gryf/pentadactyl-pm.git
synced 2025-12-23 23:52:26 +01:00
Merge branch 'master' into vimperator-2.1
This commit is contained in:
@@ -288,6 +288,7 @@ function Search() //{{{
|
|||||||
"Find word under cursor",
|
"Find word under cursor",
|
||||||
function ()
|
function ()
|
||||||
{
|
{
|
||||||
|
found = false;
|
||||||
search.searchSubmitted(buffer.getCurrentWord(), false);
|
search.searchSubmitted(buffer.getCurrentWord(), false);
|
||||||
search.findAgain();
|
search.findAgain();
|
||||||
});
|
});
|
||||||
@@ -296,6 +297,7 @@ function Search() //{{{
|
|||||||
"Find word under cursor backwards",
|
"Find word under cursor backwards",
|
||||||
function ()
|
function ()
|
||||||
{
|
{
|
||||||
|
found = false;
|
||||||
search.searchSubmitted(buffer.getCurrentWord(), true);
|
search.searchSubmitted(buffer.getCurrentWord(), true);
|
||||||
search.findAgain();
|
search.findAgain();
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1090,7 +1090,11 @@ const liberator = (function () //{{{
|
|||||||
switch (where)
|
switch (where)
|
||||||
{
|
{
|
||||||
case liberator.CURRENT_TAB:
|
case liberator.CURRENT_TAB:
|
||||||
getBrowser().loadURIWithFlags(url, Ci.nsIWebNavigation.LOAD_FLAGS_NONE, null, null, postdata);
|
try
|
||||||
|
{
|
||||||
|
getBrowser().loadURIWithFlags(url, Ci.nsIWebNavigation.LOAD_FLAGS_NONE, null, null, postdata);
|
||||||
|
}
|
||||||
|
catch (e) {}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case liberator.NEW_BACKGROUND_TAB:
|
case liberator.NEW_BACKGROUND_TAB:
|
||||||
@@ -1107,7 +1111,11 @@ const liberator = (function () //{{{
|
|||||||
const wm = Cc["@mozilla.org/appshell/window-mediator;1"].getService(Ci.nsIWindowMediator);
|
const wm = Cc["@mozilla.org/appshell/window-mediator;1"].getService(Ci.nsIWindowMediator);
|
||||||
window.open();
|
window.open();
|
||||||
whichwindow = wm.getMostRecentWindow("navigator:browser");
|
whichwindow = wm.getMostRecentWindow("navigator:browser");
|
||||||
whichwindow.loadURI(url, null, postdata);
|
try
|
||||||
|
{
|
||||||
|
whichwindow.loadURI(url, null, postdata);
|
||||||
|
}
|
||||||
|
catch (e) {}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
|||||||
Reference in New Issue
Block a user