mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/electron_settings

Browse source
This commit is contained in:
Michael Telatynski 2017-05-29 22:12:06 +01:00
commit 1d2bd68200
58 changed files with 2021 additions and 398 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -54,7 +54,19 @@ function platformFriendlyName(): string {
}
}
function _onAction(payload: Object) {
// Whitelist payload actions, no point sending most across
if (['call_state'].includes(payload.action)) {
ipcRenderer.send('app_onAction', payload);
}
}
export default class ElectronPlatform extends VectorBasePlatform {
constructor() {
super();
dis.register(_onAction);
}
setNotificationCount(count: number) {
if (this.notificationCount === count) return;
super.setNotificationCount(count);
@ -71,7 +83,6 @@ export default class ElectronPlatform extends VectorBasePlatform {
}
displayNotification(title: string, msg: string, avatarUrl: string, room: Object): Notification {
// GNOME notification spec parses HTML tags for styling...
// Electron Docs state all supported linux notification systems follow this markup spec
// https://github.com/electron/electron/blob/master/docs/tutorial/desktop-environment-integration.md#linux