aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShulhan <ms@kilabit.info>2021-07-27 00:41:07 +0700
committerShulhan <ms@kilabit.info>2021-07-27 00:41:07 +0700
commit5e9c13bbd3e3f5748cee1294cb8e9831c5aa0ea7 (patch)
treec538649c27a1d8d8dbc0a0f9da6fc249c2bd093e
parent368f58ff4b70d17b1bfc7bc5ced80efc48d0d293 (diff)
downloadpakakeh.ts-5e9c13bbd3e3f5748cee1294cb8e9831c5aa0ea7.tar.xz
editor: fix enter and support for backspace
Enter on middle of line now will cut the text and move the rest text after caret to the next line. Pressing backspace on the beginning of line will merge the line with previous one.
-rw-r--r--editor/editor.d.ts5
-rw-r--r--editor/editor.js89
-rw-r--r--editor/editor.ts108
-rw-r--r--editor/example.html12
4 files changed, 135 insertions, 79 deletions
diff --git a/editor/editor.d.ts b/editor/editor.d.ts
index 5e781e5..9685f61 100644
--- a/editor/editor.d.ts
+++ b/editor/editor.d.ts
@@ -21,10 +21,11 @@ export declare class Editor implements IEditor {
OpenFile(path: string): Response;
SaveFile(node: IVfsNode): Response;
initStyle(): void;
- insertNewline(x: number): void;
+ insertNewline(x: number, text: string): void;
onClickText(text: HTMLElement): void;
- onKeydownText(x: number, text: HTMLElement, ev: KeyboardEvent): boolean;
+ onKeydownText(x: number, text: HTMLElement, ev: KeyboardEvent): boolean | undefined;
onMouseDownAtLine(x: number): void;
onMouseUpAtLine(x: number): void;
render(): void;
+ setCaret(elText: HTMLElement, off: number): void;
}
diff --git a/editor/editor.js b/editor/editor.js
index 25c7b24..db6e1f9 100644
--- a/editor/editor.js
+++ b/editor/editor.js
@@ -54,16 +54,17 @@ var Editor = /** @class */ (function () {
Editor.prototype.initStyle = function () {
var style = document.createElement("style");
style.type = "text/css";
- style.innerText = "\n\t\t\t[contenteditable] {\n\t\t\t\toutline: 0px solid transparent;\n\t\t\t}\n\t\t\t.wui-editor {\n\t\t\t\tbackground-color: cornsilk;\n\t\t\t\tfont-family: monospace;\n\t\t\t\twidth: 100%;\n\t\t\t}\n\t\t\t.wui-editor-line {\n\t\t\t\tdisplay: table;\n\t\t\t}\n\t\t\t.wui-line-number:hover {\n\t\t\t\tbackground-color: lightsalmon;\n\t\t\t}\n\t\t\t.wui-line-number {\n\t\t\t\tdisplay: table-cell;\n\t\t\t\tpadding: 4px 1em 4px 4px;\n\t\t\t\ttext-align: right;\n\t\t\t\twidth: 3em;\n\t\t\t\tcursor: pointer;\n\t\t\t\t-webkit-user-select: none;\n\t\t\t\t-moz-user-select: none;\n\t\t\t\t-ms-user-select: none;\n\t\t\t\tuser-select: none;\n\t\t\t}\n\t\t\t.wui-line-text {\n\t\t\t\tdisplay: table-cell;\n\t\t\t\tpadding: 4px;\n\t\t\t\tborder-color: lightblue;\n\t\t\t\tborder-width: 0px;\n\t\t\t\tborder-style: solid;\n\t\t\t\twhite-space: pre-wrap;\n\t\t\t}\n\t\t";
+ style.innerText = "\n\t\t\t[contenteditable] {\n\t\t\t\toutline: 0px solid transparent;\n\t\t\t}\n\t\t\t.wui-editor {\n\t\t\t\tbackground-color: cornsilk;\n\t\t\t\tfont-family: monospace;\n\t\t\t\twidth: 100%;\n\t\t\t}\n\t\t\t.wui-editor-line {\n\t\t\t\tdisplay: table;\n\t\t\t}\n\t\t\t.wui-line-number {\n\t\t\t\t-moz-user-select: none;\n\t\t\t\t-ms-user-select: none;\n\t\t\t\t-webkit-user-select: none;\n\t\t\t\tcolor: dimgrey;\n\t\t\t\tcursor: pointer;\n\t\t\t\tdisplay: table-cell;\n\t\t\t\tpadding: 4px 1em 4px 4px;\n\t\t\t\ttext-align: right;\n\t\t\t\tuser-select: none;\n\t\t\t\twidth: 3em;\n\t\t\t}\n\t\t\t.wui-line-number:hover {\n\t\t\t\tbackground-color: lightsalmon;\n\t\t\t}\n\t\t\t.wui-line-text {\n\t\t\t\tdisplay: table-cell;\n\t\t\t\tpadding: 4px;\n\t\t\t\tborder-color: lightblue;\n\t\t\t\tborder-width: 0px;\n\t\t\t\tborder-style: solid;\n\t\t\t\twhite-space: pre-wrap;\n\t\t\t}\n\t\t";
document.head.appendChild(style);
};
- Editor.prototype.insertNewline = function (x) {
- var newline = new EditorLine(x, "", this);
+ Editor.prototype.insertNewline = function (x, text) {
+ var newline = new EditorLine(x, text, this);
for (var y = x; y < this.lines.length; y++) {
this.lines[y].setNumber(y + 2);
}
this.lines.splice(x, 0, newline);
this.render();
+ this.setCaret(newline.elText, 0);
};
Editor.prototype.onClickText = function (text) {
this.sel = window.getSelection();
@@ -77,21 +78,13 @@ var Editor = /** @class */ (function () {
if (!this.sel) {
return false;
}
+ ev.preventDefault();
var elText = this.lines[x - 1].elText;
var off = this.sel.focusOffset;
if (off > elText.innerText.length) {
off = elText.innerText.length;
}
- if (elText.firstChild) {
- this.range.setStart(elText.firstChild, off);
- }
- else {
- this.range.setStart(elText, off);
- }
- this.range.collapse(true);
- this.sel.removeAllRanges();
- this.sel.addRange(this.range);
- ev.preventDefault();
+ this.setCaret(elText, off);
break;
case "ArrowDown":
if (x == this.lines.length - 1) {
@@ -100,25 +93,50 @@ var Editor = /** @class */ (function () {
if (!this.sel) {
return false;
}
+ ev.preventDefault();
elText = this.lines[x + 1].elText;
off = this.sel.focusOffset;
if (off > elText.innerText.length) {
off = elText.innerText.length;
}
- if (elText.firstChild) {
- this.range.setStart(elText.firstChild, off);
+ this.setCaret(elText, off);
+ break;
+ case "Backspace":
+ if (x == 0) {
+ return;
}
- else {
- this.range.setStart(elText, off);
+ if (!this.sel) {
+ return;
+ }
+ off = this.sel.focusOffset;
+ if (off > 0) {
+ return;
}
- this.range.collapse(true);
- this.sel.removeAllRanges();
- this.sel.addRange(this.range);
ev.preventDefault();
+ // Join current line with previous.
+ var lineCurr = this.lines[x].elText;
+ var linePrev = this.lines[x - 1].elText;
+ off = linePrev.innerText.length;
+ linePrev.innerText = linePrev.innerText + lineCurr.innerText;
+ // Remove the current line
+ this.lines.splice(x, 1);
+ // Reset the line numbers.
+ for (; x < this.lines.length; x++) {
+ this.lines[x].setNumber(x + 1);
+ }
+ this.render();
+ this.setCaret(linePrev, off);
break;
case "Enter":
- this.insertNewline(x + 1);
+ if (!this.sel) {
+ return;
+ }
ev.preventDefault();
+ off = this.sel.focusOffset;
+ var text_1 = this.lines[x].elText.innerText;
+ var newText = text_1.slice(off, text_1.length);
+ this.lines[x].elText.innerText = text_1.slice(0, off);
+ this.insertNewline(x + 1, newText);
break;
case "Tab":
if (!this.sel) {
@@ -126,18 +144,9 @@ var Editor = /** @class */ (function () {
}
elText = this.lines[x].elText;
off = this.sel.focusOffset;
- var text_1 = elText.innerText;
+ text_1 = elText.innerText;
elText.innerText = text_1.slice(0, off) + "\t" + text_1.slice(off, text_1.length);
- off += 1;
- if (elText.firstChild) {
- this.range.setStart(elText.firstChild, off);
- }
- else {
- this.range.setStart(elText, off);
- }
- this.range.collapse(true);
- this.sel.removeAllRanges();
- this.sel.addRange(this.range);
+ this.setCaret(elText, off + 1);
ev.preventDefault();
break;
}
@@ -175,6 +184,20 @@ var Editor = /** @class */ (function () {
this.el.appendChild(line.el);
}
};
+ Editor.prototype.setCaret = function (elText, off) {
+ if (!this.sel) {
+ return;
+ }
+ if (elText.firstChild) {
+ this.range.setStart(elText.firstChild, off);
+ }
+ else {
+ this.range.setStart(elText, off);
+ }
+ this.range.collapse(true);
+ this.sel.removeAllRanges();
+ this.sel.addRange(this.range);
+ };
return Editor;
}());
exports.Editor = Editor;
@@ -212,4 +235,4 @@ var EditorLine = /** @class */ (function () {
};
return EditorLine;
}());
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"editor.js","sourceRoot":"","sources":["editor.ts"],"names":[],"mappings":"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"} \ No newline at end of file
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"editor.js","sourceRoot":"","sources":["editor.ts"],"names":[],"mappings":"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"} \ No newline at end of file
diff --git a/editor/editor.ts b/editor/editor.ts
index 048440e..b428e87 100644
--- a/editor/editor.ts
+++ b/editor/editor.ts
@@ -90,19 +90,20 @@ export class Editor implements IEditor {
.wui-editor-line {
display: table;
}
- .wui-line-number:hover {
- background-color: lightsalmon;
- }
.wui-line-number {
+ -moz-user-select: none;
+ -ms-user-select: none;
+ -webkit-user-select: none;
+ color: dimgrey;
+ cursor: pointer;
display: table-cell;
padding: 4px 1em 4px 4px;
text-align: right;
- width: 3em;
- cursor: pointer;
- -webkit-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
user-select: none;
+ width: 3em;
+ }
+ .wui-line-number:hover {
+ background-color: lightsalmon;
}
.wui-line-text {
display: table-cell;
@@ -116,13 +117,14 @@ export class Editor implements IEditor {
document.head.appendChild(style)
}
- insertNewline(x: number) {
- let newline = new EditorLine(x, "", this)
+ insertNewline(x: number, text: string) {
+ let newline = new EditorLine(x, text, this)
for (let y = x; y < this.lines.length; y++) {
this.lines[y].setNumber(y + 2)
}
this.lines.splice(x, 0, newline)
this.render()
+ this.setCaret(newline.elText, 0)
}
onClickText(text: HTMLElement) {
@@ -138,21 +140,15 @@ export class Editor implements IEditor {
if (!this.sel) {
return false
}
+ ev.preventDefault()
let elText = this.lines[x - 1].elText
let off = this.sel.focusOffset
if (off > elText.innerText.length) {
off = elText.innerText.length
}
- if (elText.firstChild) {
- this.range.setStart(elText.firstChild, off)
- } else {
- this.range.setStart(elText, off)
- }
- this.range.collapse(true)
- this.sel.removeAllRanges()
- this.sel.addRange(this.range)
- ev.preventDefault()
+ this.setCaret(elText, off)
break
+
case "ArrowDown":
if (x == this.lines.length - 1) {
return false
@@ -160,25 +156,56 @@ export class Editor implements IEditor {
if (!this.sel) {
return false
}
+ ev.preventDefault()
elText = this.lines[x + 1].elText
off = this.sel.focusOffset
if (off > elText.innerText.length) {
off = elText.innerText.length
}
- if (elText.firstChild) {
- this.range.setStart(elText.firstChild, off)
- } else {
- this.range.setStart(elText, off)
+ this.setCaret(elText, off)
+ break
+
+ case "Backspace":
+ if (x == 0) {
+ return
+ }
+ if (!this.sel) {
+ return
+ }
+ off = this.sel.focusOffset
+ if (off > 0) {
+ return
}
- this.range.collapse(true)
- this.sel.removeAllRanges()
- this.sel.addRange(this.range)
ev.preventDefault()
+
+ // Join current line with previous.
+ let lineCurr = this.lines[x].elText
+ let linePrev = this.lines[x - 1].elText
+ off = linePrev.innerText.length
+ linePrev.innerText = linePrev.innerText + lineCurr.innerText
+
+ // Remove the current line
+ this.lines.splice(x, 1)
+
+ // Reset the line numbers.
+ for (; x < this.lines.length; x++) {
+ this.lines[x].setNumber(x + 1)
+ }
+ this.render()
+ this.setCaret(linePrev, off)
break
case "Enter":
- this.insertNewline(x + 1)
+ if (!this.sel) {
+ return
+ }
ev.preventDefault()
+
+ off = this.sel.focusOffset
+ let text = this.lines[x].elText.innerText
+ let newText = text.slice(off, text.length)
+ this.lines[x].elText.innerText = text.slice(0, off)
+ this.insertNewline(x + 1, newText)
break
case "Tab":
@@ -188,20 +215,11 @@ export class Editor implements IEditor {
elText = this.lines[x].elText
off = this.sel.focusOffset
- let text = elText.innerText
+ text = elText.innerText
elText.innerText = text.slice(0, off) + "\t" + text.slice(off, text.length)
- off += 1
- if (elText.firstChild) {
- this.range.setStart(elText.firstChild, off)
- } else {
- this.range.setStart(elText, off)
- }
- this.range.collapse(true)
- this.sel.removeAllRanges()
- this.sel.addRange(this.range)
+ this.setCaret(elText, off + 1)
ev.preventDefault()
-
break
}
return true
@@ -240,6 +258,20 @@ export class Editor implements IEditor {
this.el.appendChild(line.el)
}
}
+
+ setCaret(elText: HTMLElement, off: number) {
+ if (!this.sel) {
+ return
+ }
+ if (elText.firstChild) {
+ this.range.setStart(elText.firstChild, off)
+ } else {
+ this.range.setStart(elText, off)
+ }
+ this.range.collapse(true)
+ this.sel.removeAllRanges()
+ this.sel.addRange(this.range)
+ }
}
class EditorLine {
diff --git a/editor/example.html b/editor/example.html
index 0d232f3..344bd1b 100644
--- a/editor/example.html
+++ b/editor/example.html
@@ -48,14 +48,14 @@ sudo systemctl status stackdriver-collectd
##---- Connect telegraf with collectd
-{{.Val "influxdb::dir"}}/bin/influx bucket create \
- --name stackdriver_collectd \
- --description "stackdriver collectd" \
- --org {{.Val "influxdb::org"}} \
- --token {{.Val "influxdb:telegraf:token"}} \
+{{.Val "influxdb::dir"}}/bin/influx bucket create \\
+ --name stackdriver_collectd \\
+ --description "stackdriver collectd" \\
+ --org {{.Val "influxdb::org"}} \\
+ --token {{.Val "influxdb:telegraf:token"}} \\
--retention "3d"
-#put: {{.BaseDir}}/_template/etc/telegraf/telegraf.d/stackdriver-collectd.conf \
+#put: {{.BaseDir}}/_template/etc/telegraf/telegraf.d/stackdriver-collectd.conf \\
{{.Val "influxdb::dir"}}/etc/telegraf/telegraf.d/stackdriver-collectd.conf
sudo systemctl restart telegraf