MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-01-12 15:33:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed remote desktop input only and Android.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2021-03-18 14:26:54 -07:00
parent d356c7120e
commit 60c752c0c8
3 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/styles/style.css
View File

@ -2324,6 +2324,7 @@ a {
padding-top: 2px;
padding-bottom: 2px;
background: #C0C0C0;
height: 22px;
}
.night .areaFoot {
@ -2557,7 +2558,7 @@ a {
}
#DeskClip, #DeskControlSpan, #specialkeylist {
margin-left: 6px;
padding-left: 6px;
}
.serverStateTableCell {

19
views/default-mobile.handlebars
View File

@ -4001,16 +4001,25 @@
QV('p10deskTopTable', !fullscreen);
QV('deskarea1', !fullscreen);
QV('deskarea4', !fullscreen);
var rights = GetNodeRights(currentNode);
var inputAllowed = (currentNode.agent.id != 14) && ((rights == 0xFFFFFFFF) || (((rights & 8) != 0) && ((rights & 256) == 0) && ((rights & 4096) == 0)));
// Move the zoom button to normal or top position
QS('deskkeybutton5a').top = QS('deskkeybutton5b').top = (inputAllowed) ? '160px' : '60px';
// Show full screen buttons if needed
QV('deskkeybutton1', fullscreen);
QV('deskkeybutton2a', fullscreen);
QV('deskkeybutton2a', fullscreen && inputAllowed);
QV('deskkeybutton2b', false);
QV('deskkeybutton3a', fullscreen);
QV('deskkeybutton3a', fullscreen && inputAllowed);
QV('deskkeybutton3b', false);
QV('deskkeybutton4a', fullscreen && (!desktop.m.SwapMouse));
QV('deskkeybutton4b', fullscreen && (desktop.m.SwapMouse));
QV('deskkeybutton4a', fullscreen && inputAllowed && (!desktop.m.SwapMouse));
QV('deskkeybutton4b', fullscreen && inputAllowed && (desktop.m.SwapMouse));
QV('deskkeybutton5a', fullscreen && (fullscreenzoom == 1));
QV('deskkeybutton5b', fullscreen && (fullscreenzoom != 1));
if (fullscreen) {
if (fullscreen) {deskkeybutton5a
QS('DeskParent').height = null;
QS('page_content').top = '0px';
QS('page_content').bottom = '0px';

26
views/default.handlebars
View File

@ -635,8 +635,8 @@
<select id="deskkeys" cmenu=deskKeyShortcutContextMenu></select>
<input id="DeskWD" type=button value="Send" onkeypress="return false" onkeydown="return false" onclick="deskSendKeys()" />
<input id="DeskESC" style="display:none" type="button" value="ESC" onkeypress="return false" onkeydown="return false" onclick="sendDeskEsc()" />
<input id="DeskClip" style="" type="button" value="Clipboard" onkeypress="return false" onkeydown="return false" onclick="showDeskClip()" />
<input id="DeskType" style="" type="button" value="Type" onkeypress="return false" onkeydown="return false" onclick="showDeskType()" />
<input id="DeskClip" type="button" value="Clipboard" onkeypress="return false" onkeydown="return false" onclick="showDeskClip()" />
<input id="DeskType" type="button" value="Type" onkeypress="return false" onkeydown="return false" onclick="showDeskType()" />
<label><span id="DeskControlSpan" title="Toggle mouse and keyboard input"><input id="DeskControl" type="checkbox" onkeypress="return false" onkeydown="return false" onclick="toggleKvmControl()" />Input</span></label>&nbsp;
</div>
</div>
@ -1531,10 +1531,6 @@
}
}
// Enable browser clipboard read if supported
QV('DeskClipboardOutButton', (navigator.clipboard != null) && (navigator.clipboard.readText != null));
QV('DeskClipboardInButton', (navigator.clipboard != null) && (navigator.clipboard.writeText != null));
// Session Refresh Timer
if (sessionTime >= 10) { sessionRefreshTimer = setTimeout(refreshCookieSession, Math.round((sessionTime * 60000) * 0.8)); }
@ -7125,19 +7121,26 @@
QV('d7meshkvm', (webRtcDesktop) || ((currentNode.agent != null) && (currentNode.agent.caps & 1) && ((deskState == false) || (desktop.contype == 1))));
// Enable buttons
var inputAllowed = (rights == 0xFFFFFFFF) || (((rights & 8) != 0) && ((rights & 256) == 0) && ((rights & 4096) == 0));
var inputAllowed = (currentNode.agent.id != 14) && ((rights == 0xFFFFFFFF) || (((rights & 8) != 0) && ((rights & 256) == 0) && ((rights & 4096) == 0)));
var online = ((currentNode.conn & 1) != 0); // If Agent (1) connected, enable remote desktop
QE('connectbutton1', online);
var hwonline = ((currentNode.conn & 6) != 0); // If CIRA (2) or AMT (4) connected, enable hardware terminal
QE('connectbutton1h', hwonline);
QV('deskFocusBtn', (desktop != null) && (desktop.contype == 2) && (deskState != 0) && (desktopsettings.showfocus));
QV('DeskClip', (currentNode.agent) && (currentNode.agent.id != 11) && (currentNode.agent.id != 16) && ((desktop == null) || (desktop.contype != 2))); // Clipboard not supported on macOS
QE('DeskClip', deskState == 3);
QV('DeskClip', (inputAllowed) && (currentNode.agent) && (currentNode.agent.id != 11) && (currentNode.agent.id != 16) && ((desktop == null) || (desktop.contype != 2))); // Clipboard not supported on macOS
QE('DeskESC', deskState == 3);
QV('DeskESC', browserfullscreen && inputAllowed);
QE('DeskType', deskState == 3);
QV('DeskWD', inputAllowed);
QV('DeskType', inputAllowed);
QE('DeskWD', deskState == 3);
QV('DeskWD', inputAllowed);
QV('deskkeys', inputAllowed);
QV('DeskTimer', deskState == 3);
// Enable browser clipboard read if supported
QV('DeskClipboardOutButton', inputAllowed && (navigator.clipboard != null) && (navigator.clipboard.readText != null));
QV('DeskClipboardInButton', inputAllowed && (navigator.clipboard != null) && (navigator.clipboard.writeText != null));
// Display this only if we have Chat & Notify permissions
QV('DeskSaveImageButton', (deskState == 3) && (Q('Desk')['toBlob'] != null));
@ -7146,9 +7149,10 @@
QV('DeskNotifyButton', ((rights & 16384) != 0) && (browserfullscreen == false) && (currentNode.agent) && (currentNode.agent.id < 5) && (inputAllowed) && (currentNode.agent) && online);
//QV('DeskLockButton', ((rights & 16384) != 0) && (browserfullscreen == false) && (currentNode.agent) && (currentNode.agent.id < 5) && (inputAllowed) && (currentNode.agent) && (deskState == 3));
QV('DeskLockButton', false); // TODO: Work on adding remote desktop lock feature.
QV('DeskToolsButton', (inputAllowed) && (currentNode.agent) && online);
QV('DeskToolsButton', (deskState == 3) && (currentNode.agent) && online);
QE('DeskToolsButton', inputAllowed);
QV('DeskOpenWebButton', (browserfullscreen == false) && (inputAllowed) && (currentNode.agent) && online);
QV('DeskBackgroundButton', (deskState == 3) && (desktop.contype == 1) && (currentNode.agent) && (currentNode.agent.id != 11) && (currentNode.agent.id != 16) && online);
QV('DeskBackgroundButton', inputAllowed && (deskState == 3) && (desktop.contype == 1) && (currentNode.agent) && (currentNode.agent.id != 11) && (currentNode.agent.id != 16) && online);
QV('DeskControlSpan', inputAllowed)
QV('DeskRefreshButton', (deskState == 3) && (desktop.contype == 1))
QV('deskActionsSettings', (browserfullscreen == false));