Merge branch 't34'

This commit is contained in:
zadam
2019-06-26 21:11:27 +02:00
12 changed files with 183 additions and 34 deletions
+12
View File
@@ -707,6 +707,18 @@ messagingService.subscribeToMessages(message => {
if (message.type === 'refresh-tree') {
reload();
}
else if (message.type === 'open-note') {
noteDetailService.loadNoteDetail(message.noteId, {
newTab: true,
activate: true
});
if (utils.isElectron()) {
const currentWindow = require("electron").remote.getCurrentWindow();
currentWindow.show();
}
}
});
messagingService.subscribeToSyncMessages(syncData => {