mirror of
https://github.com/zadam/trilium.git
synced 2025-11-12 08:15:52 +01:00
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:
@@ -39,7 +39,7 @@ export default class CommandButtonWidget extends AbstractButtonWidget {
|
||||
|
||||
/**
|
||||
* @param {function|string} command
|
||||
* @returns {CommandButtonWidget}
|
||||
* @returns {this}
|
||||
*/
|
||||
command(command) {
|
||||
this.settings.command = command;
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user