gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/stable'

Browse Source
This commit is contained in:
zadam 2020-04-29 22:27:46 +02:00
commit 6161b1c193
7 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -2,7 +2,7 @@
"name": "trilium", "name": "trilium",
"productName": "Trilium Notes", "productName": "Trilium Notes",
"description": "Trilium Notes", "description": "Trilium Notes",
"version": "0.41.5", "version": "0.41.6",
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
"main": "electron.js", "main": "electron.js",
"bin": { "bin": {

2
src/public/app/desktop.js
View File

@ -85,7 +85,7 @@ if (utils.isElectron()) {
}); });
} }
if (params.linkURL.length !== 0 && params.mediaType === 'none') { if (!["", "javascript:", "about:blank#blocked"].includes(params.linkURL) && params.mediaType === 'none') {
items.push({ items.push({
title: `Copy link`, title: `Copy link`,
uiIcon: "copy", uiIcon: "copy",

4
src/public/app/services/utils.js
View File

@ -103,7 +103,7 @@ function download(url) {
url += '?' + Date.now(); // don't use cache url += '?' + Date.now(); // don't use cache
if (isElectron()) { if (isElectron()) {
const remote = utils.dynamicRequire('electron').remote; const remote = dynamicRequire('electron').remote;
remote.getCurrentWebContents().downloadURL(url); remote.getCurrentWebContents().downloadURL(url);
} }
@ -277,7 +277,7 @@ function isHtmlEmpty(html) {
async function clearBrowserCache() { async function clearBrowserCache() {
if (isElectron()) { if (isElectron()) {
const win = utils.dynamicRequire('electron').remote.getCurrentWindow(); const win = dynamicRequire('electron').remote.getCurrentWindow();
await win.webContents.session.clearCache(); await win.webContents.session.clearCache();
} }
} }

3
src/public/app/widgets/collapsible_widget.js
View File

@ -34,7 +34,8 @@ export default class CollapsibleWidget extends TabAwareWidget {
this.$bodyWrapper = this.$widget.find('.body-wrapper'); this.$bodyWrapper = this.$widget.find('.body-wrapper');
this.$bodyWrapper.attr('id', this.componentId); // for toggle to work we need id this.$bodyWrapper.attr('id', this.componentId); // for toggle to work we need id
this.widgetName = this.constructor.name; // not using constructor name because of webpack mangling class names ...
this.widgetName = this.widgetTitle.replace(/[^[a-zA-Z0-9]/g, "_");
if (!options.is(this.widgetName + 'Collapsed')) { if (!options.is(this.widgetName + 'Collapsed')) {
this.$bodyWrapper.collapse("show"); this.$bodyWrapper.collapse("show");

2
src/public/app/widgets/component.js
View File

@ -15,7 +15,7 @@ import Mutex from "../services/mutex.js";
*/ */
export default class Component { export default class Component {
constructor() { constructor() {
this.componentId = `comp-${this.constructor.name}-` + utils.randomString(6); this.componentId = `comp-` + utils.randomString(8);
/** @type Component[] */ /** @type Component[] */
this.children = []; this.children = [];
this.initialized = Promise.resolve(); this.initialized = Promise.resolve();

2
src/public/app/widgets/note_tree.js
View File

@ -177,7 +177,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
// This function MUST be defined to enable dropping of items on the tree. // This function MUST be defined to enable dropping of items on the tree.
// data.hitMode is 'before', 'after', or 'over'. // data.hitMode is 'before', 'after', or 'over'.
const selectedBranchIds = this.getSelectedNodes().map(node => node.data.branchId); const selectedBranchIds = this.getSelectedOrActiveNodes().map(node => node.data.branchId);
if (data.hitMode === "before") { if (data.hitMode === "before") {
branchService.moveBeforeBranch(selectedBranchIds, node.data.branchId); branchService.moveBeforeBranch(selectedBranchIds, node.data.branchId);

2
src/services/build.js
View File

@ -1 +1 @@
module.exports = { buildDate:"2020-04-20T22:40:02+02:00", buildRevision: "a86177bb597c752fbc96a24d4be7ab5ae6c0344d" }; module.exports = { buildDate:"2020-04-27T23:46:48+02:00", buildRevision: "0a9462241360e0baac71863af3ce7fb07cfd8c87" };