Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-15 09:45:52 +01:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/stable'

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

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.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')) {
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 {
constructor() {
this.componentId = `comp-${this.constructor.name}-` + utils.randomString(6);
this.componentId = `comp-` + utils.randomString(8);
/** @type Component[] */
this.children = [];
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.
// 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") {
branchService.moveBeforeBranch(selectedBranchIds, node.data.branchId);