gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

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
parent 231adbcd31 bee4ca2b28
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');
}
}