mirror of
https://github.com/SchildiChat/element-web.git
synced 2024-10-01 01:26:12 -04:00
Merge remote-tracking branch 'origin/develop' into release-v0.9.1
This commit is contained in:
commit
d31a675ca8
@ -159,10 +159,14 @@ electron.app.on('ready', () => {
|
||||
mainWindow = new electron.BrowserWindow({
|
||||
icon: `${__dirname}/../img/riot.ico`,
|
||||
width: 1024, height: 768,
|
||||
show: false,
|
||||
});
|
||||
mainWindow.loadURL(`file://${__dirname}/../../webapp/index.html`);
|
||||
electron.Menu.setApplicationMenu(VectorMenu);
|
||||
|
||||
mainWindow.once('ready-to-show', () => {
|
||||
mainWindow.show();
|
||||
});
|
||||
mainWindow.on('closed', () => {
|
||||
mainWindow = null;
|
||||
});
|
||||
@ -198,3 +202,9 @@ electron.app.on('activate', () => {
|
||||
electron.app.on('before-quit', () => {
|
||||
appQuitting = true;
|
||||
});
|
||||
|
||||
// Set the App User Model ID to match what the squirrel
|
||||
// installer uses for the shortcut icon.
|
||||
// This makes notifications work on windows 8.1 (and is
|
||||
// a noop on other platforms).
|
||||
electron.app.setAppUserModelId('com.squirrel.riot-web.Riot');
|
||||
|
@ -79,7 +79,7 @@ export default class ElectronPlatform extends VectorBasePlatform {
|
||||
return true;
|
||||
}
|
||||
|
||||
displayNotification(title: string, msg: string, avatarUrl: string): Notification {
|
||||
displayNotification(title: string, msg: string, avatarUrl: string, room: Object): Notification {
|
||||
// Notifications in Electron use the HTML5 notification API
|
||||
const notification = new global.Notification(
|
||||
title,
|
||||
@ -97,6 +97,7 @@ export default class ElectronPlatform extends VectorBasePlatform {
|
||||
room_id: room.roomId
|
||||
});
|
||||
global.focus();
|
||||
electron.remote.getCurrentWindow().restore();
|
||||
};
|
||||
|
||||
return notification;
|
||||
|
@ -103,7 +103,7 @@ export default class WebPlatform extends VectorBasePlatform {
|
||||
return defer.promise;
|
||||
}
|
||||
|
||||
displayNotification(title: string, msg: string, avatarUrl: string) {
|
||||
displayNotification(title: string, msg: string, avatarUrl: string, room: Object) {
|
||||
const notification = new global.Notification(
|
||||
title,
|
||||
{
|
||||
@ -120,6 +120,7 @@ export default class WebPlatform extends VectorBasePlatform {
|
||||
room_id: room.roomId
|
||||
});
|
||||
global.focus();
|
||||
notification.close();
|
||||
};
|
||||
|
||||
// Chrome only dismisses notifications after 20s, which
|
||||
|
Loading…
Reference in New Issue
Block a user