wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 710142 - Make external View Source editor work again when the content comes from nsIWebBrowserPersist. r=gavin.sharp.

Browse Source
This commit is contained in:
Henri Sivonen 2011-12-20 09:41:08 +02:00
parent 65e012361b
commit 0ed62b3996
1 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
toolkit/components/viewsource/content/viewSourceUtils.js
View File

@ -84,6 +84,25 @@ var gViewSourceUtils = {
aURL, charset, aPageDescriptor, aLineNumber, isForcedCharset);
},
buildEditorArgs: function(aPath, aLineNumber) {
// Determine the command line arguments to pass to the editor.
// We currently support a %LINE% placeholder which is set to the passed
// line number (or to 0 if there's none)
var editorArgs = [];
var prefs = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefBranch);
var args = prefs.getCharPref("view_source.editor.args");
if (args) {
args = args.replace("%LINE%", aLineNumber || "0");
// add the arguments to the array (keeping quoted strings intact)
const argumentRE = /"([^"]+)"|(\S+)/g;
while (argumentRE.test(args))
editorArgs.push(RegExp.$1 || RegExp.$2);
}
editorArgs.push(aPath);
return editorArgs;
},
// aCallBack is a function accepting two arguments - result (true=success) and a data object
// It defaults to openInInternalViewer if undefined.
openInExternalEditor: function(aURL, aPageDescriptor, aDocument, aLineNumber, aCallBack)
@ -110,7 +129,9 @@ var gViewSourceUtils = {
if (uri.scheme == "file") {
// it's a local file; we can open it directly
path = uri.QueryInterface(Components.interfaces.nsIFileURL).file.path;
editor.runw(false, [path], 1);
var editorArgs = this.buildEditorArgs(path, data.lineNumber);
editor.runw(false, editorArgs, editorArgs.length);
this.handleCallBack(aCallBack, true, data);
} else {
// set up the progress listener with what we know so far
@ -215,7 +236,9 @@ var gViewSourceUtils = {
},
destroy: function() {
this.webShell.QueryInterface(Components.interfaces.nsIBaseWindow).destroy();
if (this.webShell) {
this.webShell.QueryInterface(Components.interfaces.nsIBaseWindow).destroy();
}
this.webShell = null;
this.editor = null;
this.callBack = null;
@ -223,9 +246,18 @@ var gViewSourceUtils = {
this.file = null;
},
// This listener is used both for tracking the progress of an HTML parse
// in one case and for tracking the progress of nsIWebBrowserPersist in
// another case.
onStateChange: function(aProgress, aRequest, aFlag, aStatus) {
// once it's done loading...
if ((aFlag & this.mnsIWebProgressListener.STATE_STOP) && aStatus == 0) {
if (!this.webShell) {
// We aren't waiting for the parser. Instead, we are waiting for
// an nsIWebBrowserPersist.
this.onContentLoaded();
return 0;
}
var webNavigation = this.webShell.QueryInterface(Components.interfaces.nsIWebNavigation);
if (webNavigation.document.readyState == "complete") {
// This branch is probably never taken. Including it for completeness.
@ -270,21 +302,8 @@ var gViewSourceUtils = {
.deleteTemporaryFileOnExit(this.file);
}
// Determine the command line arguments to pass to the editor.
// We currently support a %LINE% placeholder which is set to the passed
// line number (or to 0 if there's none)
var editorArgs = [];
var prefs = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefBranch);
var args = prefs.getCharPref("view_source.editor.args");
if (args) {
args = args.replace("%LINE%", this.data.lineNumber || "0");
// add the arguments to the array (keeping quoted strings intact)
const argumentRE = /"([^"]+)"|(\S+)/g;
while (argumentRE.test(args))
editorArgs.push(RegExp.$1 || RegExp.$2);
}
editorArgs.push(this.file.path);
var editorArgs = gViewSourceUtils.buildEditorArgs(this.file.path,
this.data.lineNumber);
this.editor.runw(false, editorArgs, editorArgs.length);
gViewSourceUtils.handleCallBack(this.callBack, true, this.data);