From 3a9b078bd62604fe79b1b52f25fdd60b421f0d4b Mon Sep 17 00:00:00 2001 From: jiro4989 Date: Sun, 22 Dec 2019 00:16:47 +0900 Subject: [PATCH 1/2] =?UTF-8?q?:recycle:=20=E3=82=BF=E3=82=A4=E3=83=A0?= =?UTF-8?q?=E3=82=A2=E3=82=A6=E3=83=88=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=82=92=E5=A4=89=E6=9B=B4=20#51?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- websh_server/src/websh_server.nim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/websh_server/src/websh_server.nim b/websh_server/src/websh_server.nim index 5e6770c..ce6c5de 100644 --- a/websh_server/src/websh_server.nim +++ b/websh_server/src/websh_server.nim @@ -50,7 +50,7 @@ proc runCommand(command: string, args: openArray[string], timeout: int = 3): (st sleep sleepInterval elapsedTime += sleepInterval if timeoutMilSec < elapsedTime: - let msg = &"Over timeout: {timeout} second" + let msg = &"timeout: {timeout} second" info msg return ("", "", statusTimeout, msg) block: From 0777de73b65837f47e4da9be46f7d894bd7bc9c1 Mon Sep 17 00:00:00 2001 From: jiro4989 Date: Sun, 22 Dec 2019 00:16:59 +0900 Subject: [PATCH 2/2] =?UTF-8?q?:bug:=20Ctrl=20enter=E3=81=A7=E5=AE=9F?= =?UTF-8?q?=E8=A1=8C=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=20#51?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- websh_front/src/index.nim | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/websh_front/src/index.nim b/websh_front/src/index.nim index 9f0ee9c..a50df77 100644 --- a/websh_front/src/index.nim +++ b/websh_front/src/index.nim @@ -75,7 +75,9 @@ proc createDom(): VNode = tdiv(class = "input-field col s12 m6"): textarea(id = "inputShell", class = &"materialize-textarea {textInputColor}", setFocus = true): proc onkeydown(ev: Event, n: VNode) = - if cast[KeyboardEvent](ev).keyCode == 13: + let kbEvt = cast[KeyboardEvent](ev) + # Ctrl + Enterで実行 + if kbEvt.ctrlKey and kbEvt.keyCode == 13: sendShellButtonOnClick(ev, n) proc onkeyup(ev: Event, n: VNode) = inputShell = $n.value