mirror of
https://github.com/Ylianst/MeshCentral.git
synced 2025-11-23 11:07:40 -05:00
fix annoying firefox paste option with clipboard #6571
Signed-off-by: si458 <simonsmith5521@gmail.com>
This commit is contained in:
@@ -180,6 +180,7 @@
|
|||||||
self.prevClipboardText = null;
|
self.prevClipboardText = null;
|
||||||
self.clipboardReadTimer = setInterval(function(){
|
self.clipboardReadTimer = setInterval(function(){
|
||||||
if(navigator.clipboard.readText != null){
|
if(navigator.clipboard.readText != null){
|
||||||
|
if (Mstsc.browser() == 'firefox') return; // this is needed because firefox pops up a PASTE option every second which is annoying
|
||||||
navigator.clipboard.readText()
|
navigator.clipboard.readText()
|
||||||
.then(function(data){
|
.then(function(data){
|
||||||
if(data != self.prevClipboard){
|
if(data != self.prevClipboard){
|
||||||
|
|||||||
@@ -9593,6 +9593,7 @@
|
|||||||
QH('DeskLatency', latencyStr);
|
QH('DeskLatency', latencyStr);
|
||||||
// Auto-clipboard
|
// Auto-clipboard
|
||||||
if ((((desktop.contype != 4) && (desktopsettings.autoclipboard === true)) || ((desktop.contype == 4) && (desktopsettings.rdpautoclipboard === true))) && (navigator.clipboard != null) && (navigator.clipboard.readText != null)) {
|
if ((((desktop.contype != 4) && (desktopsettings.autoclipboard === true)) || ((desktop.contype == 4) && (desktopsettings.rdpautoclipboard === true))) && (navigator.clipboard != null) && (navigator.clipboard.readText != null)) {
|
||||||
|
if (Mstsc.browser() == 'firefox') return; // this is needed because firefox pops up a PASTE option every second which is annoying
|
||||||
try {
|
try {
|
||||||
navigator.clipboard.readText().then(function(text) {
|
navigator.clipboard.readText().then(function(text) {
|
||||||
if (desktop == null) return;
|
if (desktop == null) return;
|
||||||
|
|||||||
@@ -10631,6 +10631,7 @@
|
|||||||
QH('DeskLatency', latencyStr);
|
QH('DeskLatency', latencyStr);
|
||||||
// Auto-clipboard
|
// Auto-clipboard
|
||||||
if ((((desktop.contype != 4) && (desktopsettings.autoclipboard === true)) || ((desktop.contype == 4) && (desktopsettings.rdpautoclipboard === true))) && (navigator.clipboard != null) && (navigator.clipboard.readText != null)) {
|
if ((((desktop.contype != 4) && (desktopsettings.autoclipboard === true)) || ((desktop.contype == 4) && (desktopsettings.rdpautoclipboard === true))) && (navigator.clipboard != null) && (navigator.clipboard.readText != null)) {
|
||||||
|
if (Mstsc.browser() == 'firefox') return; // this is needed because firefox pops up a PASTE option every second which is annoying
|
||||||
try {
|
try {
|
||||||
navigator.clipboard.readText().then(function (text) {
|
navigator.clipboard.readText().then(function (text) {
|
||||||
if (desktop == null) return;
|
if (desktop == null) return;
|
||||||
|
|||||||
Reference in New Issue
Block a user