jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Pierre Ossman 2016-08-26 13:34:01 +02:00
parent cd5a035d90
commit ca25d2ae26
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/styles/base.css
View File

@ -316,11 +316,6 @@ input[type=button]:active, select:active {
display: none; display: none;
} }
/* Send Ctrl+Alt+Delete */
:root:not(.noVNC_connected) #noVNC_send_ctrl_alt_del_button {
display: none;
}
#noVNC_modifiers { #noVNC_modifiers {
background-color: rgb(92, 92, 92); background-color: rgb(92, 92, 92);
border: none; border: none;

5
app/ui.js
View File

@ -210,8 +210,6 @@ var UI;
document.getElementById("noVNC_view_drag_button") document.getElementById("noVNC_view_drag_button")
.addEventListener('click', UI.toggleViewDrag); .addEventListener('click', UI.toggleViewDrag);
document.getElementById("noVNC_send_ctrl_alt_del_button")
.addEventListener('click', UI.sendCtrlAltDel);
document.getElementById("noVNC_control_bar_handle") document.getElementById("noVNC_control_bar_handle")
.addEventListener('mousedown', UI.controlbarHandleMouseDown); .addEventListener('mousedown', UI.controlbarHandleMouseDown);
@ -277,6 +275,8 @@ var UI;
.addEventListener('click', UI.sendTab); .addEventListener('click', UI.sendTab);
document.getElementById("noVNC_send_esc_button") document.getElementById("noVNC_send_esc_button")
.addEventListener('click', UI.sendEsc); .addEventListener('click', UI.sendEsc);
document.getElementById("noVNC_send_ctrl_alt_del_button")
.addEventListener('click', UI.sendCtrlAltDel);
}, },
addXvpHandlers: function() { addXvpHandlers: function() {
@ -1462,6 +1462,7 @@ var UI;
}, },
sendCtrlAltDel: function() { sendCtrlAltDel: function() {
UI.keepKeyboard();
UI.rfb.sendCtrlAltDel(); UI.rfb.sendCtrlAltDel();
}, },

8
vnc.html
View File

@ -102,15 +102,13 @@
<input type="image" alt="Esc" src="app/images/esc.svg" <input type="image" alt="Esc" src="app/images/esc.svg"
id="noVNC_send_esc_button" class="noVNC_button" id="noVNC_send_esc_button" class="noVNC_button"
title="Send Escape"/> 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> </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 --> <!-- XVP Shutdown/Reboot -->
<input type="image" alt="Shutdown/Reboot" src="app/images/power.svg" <input type="image" alt="Shutdown/Reboot" src="app/images/power.svg"
id="noVNC_xvp_button" class="noVNC_button" id="noVNC_xvp_button" class="noVNC_button"