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

Add :yank command.

Browse Source
This commit is contained in:
Kris Maglione
2010-10-14 18:31:12 -04:00
parent 6cd4f05790
commit 9f9021e68e
7 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
common/content/commandline.js
View File

@@ -538,7 +538,7 @@ const CommandLine = Module("commandline", {
* @param {boolean} forceSingle If provided, don't let over-long
* messages move to the MOW.
*/
_echoLine: function echoLine(str, highlightGroup, forceSingle) {
_echoLine: function echoLine(str, highlightGroup, forceSingle, silent) {
this.widgets.message = str ? [highlightGroup, str] : null;
dactyl.triggerObserver("echoLine", str, highlightGroup, forceSingle);
@@ -549,7 +549,7 @@ const CommandLine = Module("commandline", {
let field = this.widgets.active.message.inputField;
if (field.value && !forceSingle && field.editor.rootElement.scrollWidth > field.scrollWidth) {
this.widgets.message = null;
this._echoMultiline(<span highlight="Message">{str}</span>, highlightGroup);
this._echoMultiline(<span highlight="Message">{str}</span>, highlightGroup, true);
}
},
@@ -559,7 +559,7 @@ const CommandLine = Module("commandline", {
* @param {string} str
* @param {string} highlightGroup
*/
_echoMultiline: function echoMultiline(str, highlightGroup) {
_echoMultiline: function echoMultiline(str, highlightGroup, silent) {
let doc = this.widgets.multilineOutput.contentDocument;
let win = this.widgets.multilineOutput.contentWindow;
@@ -567,8 +567,6 @@ const CommandLine = Module("commandline", {
if (!this.commandVisible)
this.hide();
dactyl.triggerObserver("echoMultiline", str, highlightGroup);
this._startHints = false;
if (!(modes.extended & modes.OUTPUT_MULTILINE))
modes.push(modes.COMMAND_LINE, modes.OUTPUT_MULTILINE, {
@@ -585,6 +583,9 @@ const CommandLine = Module("commandline", {
this._lastMowOutput = <div class="ex-command-output" style={"white-space: " + style} highlight={highlightGroup}>{str}</div>;
let output = util.xmlToDom(this._lastMowOutput, doc);
if (!silent)
dactyl.triggerObserver("echoMultiline", str, highlightGroup, output);
// FIXME: need to make sure an open MOW is closed when commands
// that don't generate output are executed
if (this.widgets.mowContainer.collapsed)
@@ -660,7 +661,7 @@ const CommandLine = Module("commandline", {
else {
if (this.widgets.message && this.widgets.message[1] == this._lastEcho)
this._echoMultiline(<span highlight="Message">{this._lastEcho}</span>,
this.widgets.message[0]);
this.widgets.message[0], true);
if (action === this._echoLine && !(flags & this.FORCE_MULTILINE) && !this.widgets.mowContainer.collapsed) {
highlightGroup += " Message";
@@ -1153,6 +1154,17 @@ const CommandLine = Module("commandline", {
}
if (this._history)
this._history.reset();
},
withOutputToString: function (fn, self) {
let buffer = [];
dactyl.registerObserver("echoLine", observe, true);
dactyl.registerObserver("echoMultiline", observe, true);
function observe(str, highlight, dom) {
buffer.push(dom ? dom.textContent : str)
}
dactyl.trapErrors.apply(dactyl, [fn, self].concat(Array.slice(arguments, 2)));
return buffer.join("\n");
}
}, {
/**