Fixed remote desktop clipboard feature.
Ylian Saint-Hilaire committed
Nov 19, 2020 at 16:07 UTC
2c970c23d50178ae8176aeba5066d81086eb2a19
1 file changed
+6
-6
views/default.handlebars
+6
-6
@@ -1519,7 +1519,8 @@
1519
}
1520
1521
// Enable browser clipboard read if supported
1522
- QV('DeskClipboardInButton', (navigator.clipboard != null) && (navigator.clipboard.readText != null));
1522
+ QV('DeskClipboardOutButton', (navigator.clipboard != null) && (navigator.clipboard.readText != null));
1523
+ QV('DeskClipboardInButton', (navigator.clipboard != null) && (navigator.clipboard.writeText != null));
1524
1525
// Session Refresh Timer
1526
if (sessionTime >= 10) { sessionRefreshTimer = setTimeout(refreshCookieSession, Math.round((sessionTime * 60000) * 0.8)); }
@@ -2197,7 +2198,7 @@
2198
if ((message.tag == 1) && (xxdialogTag == 'clipboard')) {
2199
Q('d2clipText').value = message.data; // Put remote clipboard data into dialog box
2200
} else if (message.tag == 2) {
2200
- if (navigator.clipboard != null) { navigator.clipboard.writeText(message.data).then(function() { console.log('ok'); }).catch(function(err) { console.log(err); }) } // Put remote clipboard data into our clipboard
2201
+ if (navigator.clipboard != null) { navigator.clipboard.writeText(message.data).then(function() { }).catch(function(err) { console.log(err); }) } // Put remote clipboard data into our clipboard
2202
}
2203
} else if ((message.type == 'setclip') && (xxdialogTag == 'clipboard') && (currentNode != null) && (currentNode._id == message.nodeid)) {
2204
// Display success/fail on the clipboard dialog box.
@@ -4014,7 +4015,7 @@
4015
desk.m.ScalingLevel = multidesktopsettings.scaling;
4016
if (multidesktopsettings.framerate) { desk.m.FrameRateTimer = multidesktopsettings.framerate; }
4017
if (multidesktopsettings.swapmouse) { desk.m.SwapMouse = multidesktopsettings.swapmouse; }
4017
- if (multidesktopsettings.remotekeymap) { desk.m.remoteKeyMap = multidesktopsettings.remotekeymap; }
4018
+ if (multidesktopsettings.remotekeymap == true) { desk.m.remoteKeyMap = multidesktopsettings.remotekeymap; }
4019
//desk.m.onDisplayinfo = deskDisplayInfo;
4020
//desk.m.onScreenSizeChange = deskAdjust;
4021
if (debugmode > 0) { desk.m.onScreenSizeChange = mdeskAdjust; } // Multi-Desktop Adjust
@@ -6957,7 +6958,7 @@
6958
desktop.m.ScalingLevel = desktopsettings.scaling;
6959
if (desktopsettings.framerate) { desktop.m.FrameRateTimer = desktopsettings.framerate; }
6960
if (desktopsettings.swapmouse) { desktop.m.SwapMouse = desktopsettings.swapmouse; }
6960
- if (desktopsettings.remotekeymap) { desktop.m.remoteKeyMap = desktopsettings.remotekeymap; }
6961
+ if (desktopsettings.remotekeymap == true) { desktop.m.remoteKeyMap = desktopsettings.remotekeymap; }
6962
desktop.m.onDisplayinfo = deskDisplayInfo;
6963
desktop.m.onScreenSizeChange = deskAdjust;
6964
desktop.Start(desktopNode._id);
@@ -7410,8 +7411,7 @@
7411
}, 10);
7412
} else {
7413
// MeshAgent
7413
- var winagent = ((currentNode.agent.id > 0) && (currentNode.agent.id < 5));
7414
- if (winagent) {
7414
+ if (desktopsettings.remotekeymap !== true) {
7415
// New unicode typing
7416
desktop.m.SendStringUnicode(txt);
7417
} else {