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

Make :viewsource a bit more robust

Browse Source
This commit is contained in:
Kris Maglione
2009-09-17 14:00:26 -04:00
parent 52378d8a9f
commit f6e130a93f
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
common/content/buffer.js
View File

@@ -326,15 +326,7 @@ function Buffer() //{{{
mappings.add(myModes, ["\\"], mappings.add(myModes, ["\\"],
"Toggle between rendered and source view", "Toggle between rendered and source view",
function () function () { buffer.viewSource(null, false); });
{
const scheme = "view-source";
if (util.newURI(buffer.URL).scheme == scheme)
liberator.open(buffer.URL.substr(scheme.length + 1));
else
liberator.open(scheme + ":" + buffer.URL);
});
mappings.add(myModes, ["gi"], mappings.add(myModes, ["gi"],
"Focus last used input field", "Focus last used input field",
@@ -1593,7 +1585,14 @@ function Buffer() //{{{
if (useExternalEditor) if (useExternalEditor)
editor.editFileExternally(url); editor.editFileExternally(url);
else else
liberator.open("view-source:" + url); {
const PREFIX = "view-source:";
if (url.indexOf(PREFIX) == 0)
url = url.substr(PREFIX.length);
else
url = PREFIX + url;
liberator.open(url, { hide: true });
}
}, },
/** /**

13
common/content/liberator.js
View File

@@ -1527,7 +1527,7 @@ const liberator = (function () //{{{
* ["url1", "url2", "url3", ...] * ["url1", "url2", "url3", ...]
* or: * or:
* [["url1", postdata1], ["url2", postdata2], ...] * [["url1", postdata1], ["url2", postdata2], ...]
* @param {number} where If ommited, CURRENT_TAB is assumed but NEW_TAB * @param {number|Object} where If ommited, CURRENT_TAB is assumed but NEW_TAB
* is set when liberator.forceNewTab is true. * is set when liberator.forceNewTab is true.
* @param {boolean} force Don't prompt whether to open more than 20 * @param {boolean} force Don't prompt whether to open more than 20
* tabs. * tabs.
@@ -1563,6 +1563,15 @@ const liberator = (function () //{{{
return true; return true;
} }
let flags = 0;
if (where instanceof Object)
{
for (let [opt, flag] in Iterator({ replace: "REPLACE_HISTORY", hide: "BYPASS_HISTORY" }))
if (where[opt])
flags |= Ci.nsIWebNavigation["LOAD_FLAGS_" + flag];
where = liberator.CURRENT_TAB;
}
if (urls.length == 0) if (urls.length == 0)
return false; return false;
@@ -1577,7 +1586,7 @@ const liberator = (function () //{{{
switch (where) switch (where)
{ {
case liberator.CURRENT_TAB: case liberator.CURRENT_TAB:
browser.loadURIWithFlags(url, Ci.nsIWebNavigation.LOAD_FLAGS_NONE, null, null, postdata); browser.loadURIWithFlags(url, flags, null, null, postdata);
break; break;
case liberator.NEW_BACKGROUND_TAB: case liberator.NEW_BACKGROUND_TAB: