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

Factor out unnecessary and potentially problematic use of threadYield in editFieldExternally.

Browse Source
This commit is contained in:
Kris Maglione
2010-12-22 04:33:32 -05:00
parent 35a0917084
commit 9a1d78ee56
3 changed files with 71 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
common/content/editor.js
View File

@@ -252,7 +252,7 @@ const Editor = Module("editor", {
},
// TODO: clean up with 2 functions for textboxes and currentEditor?
editFieldExternally: function (forceEditing) {
editFieldExternally: function editFieldExternally(forceEditing) {
if (!options["editor"])
return;
@@ -280,72 +280,72 @@ const Editor = Module("editor", {
dactyl.assert(editor);
text = Array.map(editor.rootElement.childNodes, function (e) util.domToString(e, true)).join("");
}
let oldBg, tmpBg;
try {
let res = io.withTempFiles(function (tmpfile) {
if (textBox) {
textBox.setAttribute("readonly", "true");
oldBg = textBox.style.backgroundColor;
tmpBg = "yellow";
textBox.style.backgroundColor = "#bbbbbb";
}
function cleanup(error) {
if (timer)
timer.cancel();
if (!tmpfile.write(text))
throw Error("Input contains characters not valid in the current " +
"file encoding");
if (error) {
dactyl.reportError(error, true);
tmpBg = "red";
}
else
dactyl.trapErrors(update, null, true);
let lastUpdate = Date.now();
function update(force) {
if (force !== true && tmpfile.lastModifiedTime <= lastUpdate)
return;
lastUpdate = Date.now();
if (tmpfile && tmpfile.exists())
tmpfile.remove(false);
let val = tmpfile.read();
if (textBox)
textBox.value = val;
else {
while (editor.rootElement.firstChild)
editor.rootElement.removeChild(editor.rootElement.firstChild);
editor.rootElement.innerHTML = val;
}
}
let timer = services.Timer(update, 100, services.Timer.TYPE_REPEATING_SLACK);
try {
this.editFileExternally({ file: tmpfile.path, line: line, column: column }, true);
}
finally {
timer.cancel();
}
update(true);
}, this);
if (res == false)
throw Error("Couldn't create temporary file");
}
catch (e) {
// Errors are unlikely, and our error messages won't
// likely be any more helpful than that given in the
// exception.
dactyl.reportError(e, true);
tmpBg = "red";
}
finally {
if (textBox)
textBox.removeAttribute("readonly");
// blink the textbox after returning
if (textBox) {
let colors = [tmpBg, oldBg, tmpBg, oldBg];
(function next() {
textBox.style.backgroundColor = colors.shift();
if (colors.length > 0)
util.timeout(next, 100);
})();
}
}
// blink the textbox after returning
if (textBox) {
let colors = [tmpBg, oldBg, tmpBg, oldBg];
(function next() {
textBox.style.backgroundColor = colors.shift();
if (colors.length > 0)
util.timeout(next, 100);
})();
try {
var tmpfile = io.createTempFile();
if (!tmpfile)
throw Error("Couldn't create temporary file");
if (textBox) {
textBox.setAttribute("readonly", "true");
oldBg = textBox.style.backgroundColor;
tmpBg = "yellow";
textBox.style.backgroundColor = "#bbbbbb";
}
if (!tmpfile.write(text))
throw Error("Input contains characters not valid in the current " +
"file encoding");
let lastUpdate = Date.now();
function update(force) {
if (force !== true && tmpfile.lastModifiedTime <= lastUpdate)
return;
lastUpdate = Date.now();
let val = tmpfile.read();
if (textBox)
textBox.value = val;
else {
while (editor.rootElement.firstChild)
editor.rootElement.removeChild(editor.rootElement.firstChild);
editor.rootElement.innerHTML = val;
}
}
var timer = services.Timer(update, 100, services.Timer.TYPE_REPEATING_SLACK);
this.editFileExternally({ file: tmpfile.path, line: line, column: column }, cleanup);
}
catch (e) {
cleanup(e);
}
},