masq
/
glowing-bear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tauri: disable servicework for tauri, since its just complicating 

matters

  * add Backquote key to a keybinding to make it work on macos under
    tauri
  * sync document title with window title when running in tauri
This commit is contained in:
Tor Hveem 2023-02-10 11:25:58 +01:00
parent 8875e0604a
commit 22fe5963c5
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/js/inputbar.js
View File

@ -563,7 +563,9 @@ weechat.directive('inputBar', function() {
// Alt+< -> switch to previous buffer // Alt+< -> switch to previous buffer
// https://w3c.github.io/uievents-code/#code-IntlBackslash // https://w3c.github.io/uievents-code/#code-IntlBackslash
if ($event.altKey && (code === 60 || code === 226 || key === "IntlBackslash")) { // Support both backquote and intlbackslash for this action, since macos is weird
// https://github.com/microsoft/vscode/issues/65082
if ($event.altKey && (code === 60 || code === 226 || key === "IntlBackslash" || key === "Backquote")) {
var previousBuffer = models.getPreviousBuffer(); var previousBuffer = models.getPreviousBuffer();
if (previousBuffer) { if (previousBuffer) {
models.setActiveBuffer(previousBuffer.id); models.setActiveBuffer(previousBuffer.id);

17
src/js/notifications.js
View File

@ -25,7 +25,7 @@ weechat.factory('notifications', ['$rootScope', '$log', 'models', 'settings', 'u
} }
// Check for serviceWorker support, and also disable serviceWorker if we're running in electron process, since that's just problematic and not necessary, since gb then already is in a separate process // Check for serviceWorker support, and also disable serviceWorker if we're running in electron process, since that's just problematic and not necessary, since gb then already is in a separate process
if ('serviceWorker' in navigator && window.is_electron !== 1) { if ('serviceWorker' in navigator && window.is_electron !== 1 && !utils.isTauri()) {
$log.info('Service Worker is supported'); $log.info('Service Worker is supported');
navigator.serviceWorker.register('serviceworker.js').then(function(reg) { navigator.serviceWorker.register('serviceworker.js').then(function(reg) {
$log.info('Service Worker install:', reg); $log.info('Service Worker install:', reg);
@ -52,6 +52,7 @@ weechat.factory('notifications', ['$rootScope', '$log', 'models', 'settings', 'u
}; };
var showNotification = function(buffer, title, body) { var showNotification = function(buffer, title, body) {
$log.info('Showing notification', title);
if (serviceworker) { if (serviceworker) {
navigator.serviceWorker.ready.then(function(registration) { navigator.serviceWorker.ready.then(function(registration) {
registration.showNotification(title, { registration.showNotification(title, {
@ -87,13 +88,14 @@ weechat.factory('notifications', ['$rootScope', '$log', 'models', 'settings', 'u
body: body, body: body,
icon: 'assets/img/favicon.png' icon: 'assets/img/favicon.png'
}); });
$log.info('Using Web API Notification', notification);
// Save notification, so we can close all outstanding ones when disconnecting // Save notification, so we can close all outstanding ones when disconnecting
notification.id = notifications.length; notification.id = notifications.length;
notifications.push(notification); notifications.push(notification);
// Cancel notification automatically // Cancel notification automatically
var timeout = 15*1000; var timeout = 15*1000; // 15 seconds
notification.onshow = function() { notification.onshow = function() {
setTimeout(function() { setTimeout(function() {
notification.close(); notification.close();
@ -101,7 +103,8 @@ weechat.factory('notifications', ['$rootScope', '$log', 'models', 'settings', 'u
}; };
// Click takes the user to the buffer // Click takes the user to the buffer
notification.onclick = function() { notification.onclick = function(event) {
event.preventDefault();
models.setActiveBuffer(buffer.id); models.setActiveBuffer(buffer.id);
window.focus(); window.focus();
notification.close(); notification.close();
@ -161,7 +164,13 @@ weechat.factory('notifications', ['$rootScope', '$log', 'models', 'settings', 'u
var activeBuffer = models.getActiveBuffer(); var activeBuffer = models.getActiveBuffer();
if (activeBuffer) { if (activeBuffer) {
$rootScope.pageTitle = activeBuffer.shortName + ' | ' + activeBuffer.rtitle; let title = activeBuffer.shortName + ' | ' + activeBuffer.rtitle;
$rootScope.pageTitle = title;
// If running in Tauri, use platform code to update its window title
if (utils.isTauri()) {
__TAURI__.window.appWindow.setTitle(title);
}
} }
}; };