From cc2acb8bdc5b3f6d86b2ceb56f2cc73ed3ce28ef Mon Sep 17 00:00:00 2001 From: Devine Lu Linvega Date: Mon, 17 Apr 2017 16:55:57 -1000 Subject: [PATCH] New UX --- links/main.css | 7 +++---- scripts/modules/terminal.js | 7 +++++++ scripts/modules/type.js | 9 ++++++--- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/links/main.css b/links/main.css index 78255f5..d7e0d35 100644 --- a/links/main.css +++ b/links/main.css @@ -33,10 +33,9 @@ body { margin:0px; padding:0px; overflow:hidden; font-family:"input_mono_medium" #terminal #widget li { display:block; } #terminal #widget li.active { color:#72dec2; } #terminal #widget li.inactive { color:#fff; } -#terminal #widget li.managed { color:#777; }#terminal - -#terminal hint { display: block;position: fixed;top: 100px;width: calc(40vw - 60px);height: calc(100vh - 130px);padding: 0px 15px;line-height: 20px;font-size: 12px;background: none;color: #999;border-left:1px solid #333;margin-left:15px} +#terminal #widget li.managed { color:#777; } +#terminal hint { display: block;position: fixed;top: 100px;width: calc(40vw - 45px);height: calc(100vh - 130px);padding: 0px 15px;line-height: 20px;font-size: 12px;background: none;color: #999;border-left:1px solid #333;margin-left:15px} #terminal hint line { display: inline; width:calc(100% - 30px); } -#terminal hint line .input { background:red; } +#terminal hint line .input { opacity:0.1; } #terminal hint line .status { position: absolute;right:30px; } \ No newline at end of file diff --git a/scripts/modules/terminal.js b/scripts/modules/terminal.js index a8ca99b..40bf3a7 100644 --- a/scripts/modules/terminal.js +++ b/scripts/modules/terminal.js @@ -168,6 +168,13 @@ function Terminal(rune) } rawFile.send(null); } + + this.cmd = function() + { + var lines = ronin.terminal.textarea.value.split("\n"); + var last = lines[lines.length-1]; + return new Command(last.split(" ")); + } } // Log diff --git a/scripts/modules/type.js b/scripts/modules/type.js index 053ffcc..4dbe6b4 100644 --- a/scripts/modules/type.js +++ b/scripts/modules/type.js @@ -35,19 +35,22 @@ function Type(rune) this.mouse_down = function(position) { - var line = "type.write "+position.render()+" \"Placeholder\""; + var str = ronin.terminal.cmd().text() ? ronin.terminal.cmd().text() : "Placeholder"; + var line = "type.write "+position.render()+" \""+str+"\""; ronin.terminal.update_active_line(line); } this.mouse_move = function(position,rect) { - var line = "type.write "+position.render()+" \"Placeholder\""; + var str = ronin.terminal.cmd().text() ? ronin.terminal.cmd().text() : "Placeholder"; + var line = "type.write "+position.render()+" \""+str+"\""; ronin.terminal.update_active_line(line); } this.mouse_up = function(position) { - var line = "type.write "+position.render()+" \"Placeholder\""; + var str = ronin.terminal.cmd().text() ? ronin.terminal.cmd().text() : "Placeholder"; + var line = "type.write "+position.render()+" \""+str+"\""; ronin.terminal.update_active_line(line); ronin.terminal.textarea.value += "\n"; ronin.cursor.release();