PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #2994 from vector-im/dbkr/carlos22_notif_fixes

Browse source 
Fixes to electron desktop notifs
This commit is contained in:
Richard van der Hoff 2017-01-19 14:03:02 +00:00 committed by GitHub
commit 686a3c693a
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/vector/platform/ElectronPlatform.js
View file

@ -97,7 +97,10 @@ export default class ElectronPlatform extends VectorBasePlatform {
room_id: room.roomId
});
global.focus();
electron.remote.getCurrentWindow().restore();
const currentWin = electron.remote.getCurrentWindow();
currentWin.show();
currentWin.restore();
currentWin.focus();
};
return notification;
@ -131,4 +134,8 @@ export default class ElectronPlatform extends VectorBasePlatform {
screenCaptureErrorString() {
return null;
}
requestNotificationPermission() : Promise {
return q('granted');
}
}