Merge remote-tracking branch 'origin/master' into m42

# Conflicts:
#	src/public/app/services/app_context.js
This commit is contained in:
zadam
2020-04-25 23:53:19 +02:00
10 changed files with 26 additions and 22 deletions

View File

@@ -101,12 +101,6 @@ class AppContext extends Component {
return $(el).closest(".component").prop('component');
}
async protectedSessionStartedEvent() {
await treeCache.loadInitialTree();
this.triggerEvent('treeCacheReloaded');
}
async openInNewWindow(notePath) {
if (utils.isElectron()) {
const {ipcRenderer} = utils.dynamicRequire('electron');