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 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: