diff options
| author | Pierre Ossman <ossman@cendio.se> | 2016-08-26 13:34:01 +0200 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2016-09-23 14:39:21 +0200 |
| commit | ca25d2ae26ffb22a2b7f9a4c56393165ca70052b (patch) | |
| tree | 6d89abbf7f6ff625cf2270d78fb252cda78751d2 | |
| parent | cd5a035d901e536d726400708c7929e5df0fa7b2 (diff) | |
| download | novnc-ca25d2ae26ffb22a2b7f9a4c56393165ca70052b.tar.gz | |
Move Ctrl+Alt+Del to extra keys menu
The extra keys menu is now present for all devices, so avoid clutter
by moving the Ctrl+Alt+Del button there as well.
| -rw-r--r-- | app/styles/base.css | 5 | ||||
| -rw-r--r-- | app/ui.js | 5 | ||||
| -rw-r--r-- | vnc.html | 8 |
3 files changed, 6 insertions, 12 deletions
diff --git a/app/styles/base.css b/app/styles/base.css index 8fbcb28..b87c52e 100644 --- a/app/styles/base.css +++ b/app/styles/base.css @@ -316,11 +316,6 @@ input[type=button]:active, select:active { display: none; } -/* Send Ctrl+Alt+Delete */ -:root:not(.noVNC_connected) #noVNC_send_ctrl_alt_del_button { - display: none; -} - #noVNC_modifiers { background-color: rgb(92, 92, 92); border: none; @@ -210,8 +210,6 @@ var UI; document.getElementById("noVNC_view_drag_button") .addEventListener('click', UI.toggleViewDrag); - document.getElementById("noVNC_send_ctrl_alt_del_button") - .addEventListener('click', UI.sendCtrlAltDel); document.getElementById("noVNC_control_bar_handle") .addEventListener('mousedown', UI.controlbarHandleMouseDown); @@ -277,6 +275,8 @@ var UI; .addEventListener('click', UI.sendTab); document.getElementById("noVNC_send_esc_button") .addEventListener('click', UI.sendEsc); + document.getElementById("noVNC_send_ctrl_alt_del_button") + .addEventListener('click', UI.sendCtrlAltDel); }, addXvpHandlers: function() { @@ -1462,6 +1462,7 @@ var UI; }, sendCtrlAltDel: function() { + UI.keepKeyboard(); UI.rfb.sendCtrlAltDel(); }, @@ -102,15 +102,13 @@ <input type="image" alt="Esc" src="app/images/esc.svg" id="noVNC_send_esc_button" class="noVNC_button" title="Send Escape"/> + <input type="image" alt="Ctrl+Alt+Del" src="app/images/ctrlaltdel.svg" + id="noVNC_send_ctrl_alt_del_button" class="noVNC_button" + title="Send Ctrl-Alt-Del" /> </div> </div> </div> - <!-- Send Ctrl+Alt+Delete --> - <input type="image" alt="Ctrl+Alt+Del" src="app/images/ctrlaltdel.svg" - id="noVNC_send_ctrl_alt_del_button" class="noVNC_button" - title="Send Ctrl-Alt-Del" /> - <!-- XVP Shutdown/Reboot --> <input type="image" alt="Shutdown/Reboot" src="app/images/power.svg" id="noVNC_xvp_button" class="noVNC_button" |