MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-02-04 10:25:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix Messenger when Notification not supported in browser.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2021-06-01 22:54:22 -07:00
parent 4f22c3fac4
commit cd7443fe98
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
views/messenger.handlebars
View File

@ -90,6 +90,7 @@
var remoteOutText = false; var remoteOutText = false;
var remoteImage = false; var remoteImage = false;
var serverRecording = false; var serverRecording = false;
var notificationSupport = true;
// File transfer state // File transfer state
var fileUploads = []; var fileUploads = [];
@ -120,7 +121,7 @@
QH('xtitle', EscapeHtml(newTitle).split(' ').join('&nbsp')); QH('xtitle', EscapeHtml(newTitle).split(' ').join('&nbsp'));
// Setup web notifications // Setup web notifications
try { if (Notification) { QV('notifyButton', Notification.permission != 'granted'); } } catch (ex) { } try { if (Notification) { QV('notifyButton', Notification.permission != 'granted'); } } catch (ex) { notificationSupport = false; }
// Track window focus // Track window focus
window.addEventListener('focus', function (event) { windowFocus = true; }, false); window.addEventListener('focus', function (event) { windowFocus = true; }, false);
@ -132,14 +133,18 @@
document.addEventListener('drop', fileDrop, false); document.addEventListener('drop', fileDrop, false);
document.onclick = function (e) { document.onclick = function (e) {
if (Notification) { QV('notifyButton', Notification.permission != 'granted'); } if (notificationSupport) {
if (notification != null) { notification.close(); notification = null; } if (Notification) { QV('notifyButton', Notification.permission != 'granted'); }
if (notification != null) { notification.close(); notification = null; }
}
} }
// Trap document key up events // Trap document key up events
document.onkeyup = function ondockeypress(e) { document.onkeyup = function ondockeypress(e) {
if (Notification) { QV('notifyButton', Notification.permission != 'granted'); } if (notificationSupport) {
if (notification != null) { notification.close(); notification = null; } if (Notification) { QV('notifyButton', Notification.permission != 'granted'); }
if (notification != null) { notification.close(); notification = null; }
}
if (state == 2) { if (state == 2) {
if ((e.keyCode == 8) && (userInputFocus == 0)) { if ((e.keyCode == 8) && (userInputFocus == 0)) {
// Backspace // Backspace
@ -153,8 +158,10 @@
// Trap document key presses // Trap document key presses
document.onkeypress = function ondockeypress(e) { document.onkeypress = function ondockeypress(e) {
if (Notification) { QV('notifyButton', Notification.permission != 'granted'); } if (notificationSupport) {
if (notification != null) { notification.close(); notification = null; } if (Notification) { QV('notifyButton', Notification.permission != 'granted'); }
if (notification != null) { notification.close(); notification = null; }
}
if ((state == 2) || pushMessaging) { if ((state == 2) || pushMessaging) {
if (e.keyCode == 13) { if (e.keyCode == 13) {
// Return // Return
@ -227,17 +234,21 @@
Q('xmsgparent').scrollTop = Q('xmsgparent').scrollHeight; Q('xmsgparent').scrollTop = Q('xmsgparent').scrollHeight;
// If web notifications are granted, use it. // If web notifications are granted, use it.
if (Notification) { QV('notifyButton', Notification.permission != 'granted'); } if (notificationSupport) {
if (Notification && (windowFocus == false) && (Notification.permission == 'granted')) { if (Notification) { QV('notifyButton', Notification.permission != 'granted'); }
if (notification != null) { notification.close(); notification = null; } if (Notification && (windowFocus == false) && (Notification.permission == 'granted')) {
notification = new Notification(Q('xtitle').innerHTML.split(' ').join(' '), { body: msg }); if (notification != null) { notification.close(); notification = null; }
notification = new Notification(Q('xtitle').innerHTML.split(' ').join(' '), { body: msg });
}
} }
} }
// Display and send a message from the local user // Display and send a message from the local user
function xsend(event) { function xsend(event) {
if (notification != null) { notification.close(); notification = null; } if (notificationSupport) {
if (Notification) { QV('notifyButton', Notification.permission != 'granted'); } if (notification != null) { notification.close(); notification = null; }
if (Notification) { QV('notifyButton', Notification.permission != 'granted'); }
}
var outtext = Q('xouttext').value; var outtext = Q('xouttext').value;
if (outtext.length > 0) { if (outtext.length > 0) {
chatTextSession += ((new Date()).toLocaleTimeString() + ' - ' + "Local" + '> ' + outtext + '\r\n'); chatTextSession += ((new Date()).toLocaleTimeString() + ' - ' + "Local" + '> ' + outtext + '\r\n');
@ -623,7 +634,9 @@
// Toggle notification // Toggle notification
function enableNotificationsButtonClick() { function enableNotificationsButtonClick() {
if (Notification) { Notification.requestPermission().then(function (permission) { QV('notifyButton', permission != 'granted'); }); } if (notificationSupport) {
if (Notification) { Notification.requestPermission().then(function (permission) { QV('notifyButton', permission != 'granted'); }); }
}
return false; return false;
} }