Merge branch 'master' into dev

# Conflicts:
#	package-lock.json
#	package.json
#	src/public/app/widgets/dialogs/note_revisions.js
#	src/services/handlers.js
#	src/services/hidden_subtree.js
#	src/services/search/services/parse.js
This commit is contained in:
zadam
2023-01-17 22:20:10 +01:00
30 changed files with 167 additions and 36 deletions

View File

@@ -39,7 +39,7 @@ export default class CommandButtonWidget extends AbstractButtonWidget {
/**
* @param {function|string} command
* @returns {CommandButtonWidget}
* @returns {this}
*/
command(command) {
this.settings.command = command;

View File

@@ -303,7 +303,7 @@ export default class GlobalMenuWidget extends BasicWidget {
const resp = await fetch(RELEASES_API_URL);
const data = await resp.json();
return data.tag_name.substring(1);
return data?.tag_name?.substring(1);
}
downloadLatestVersionCommand() {

View File

@@ -23,6 +23,10 @@ export default class HistoryNavigationButton extends ButtonFromNoteWidget {
doRender() {
super.doRender();
if (!utils.isElectron()) {
return;
}
this.webContents = utils.dynamicRequire('@electron/remote').getCurrentWebContents();
// without this the history is preserved across frontend reloads