Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-11-04 15:11:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zadam 2021-11-23 23:09:37 +01:00
commit d59542dd6f
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,6 +150,7 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
doRender() { doRender() {
this.$widget = $(TPL); this.$widget = $(TPL);
this.$tree = this.$widget.find('.tree'); this.$tree = this.$widget.find('.tree');
this.$treeActions = this.$widget.find(".tree-actions");
this.$tree.on("mousedown", ".unhoist-button", () => hoistedNoteService.unhoist()); this.$tree.on("mousedown", ".unhoist-button", () => hoistedNoteService.unhoist());
this.$tree.on("mousedown", ".refresh-search-button", e => this.refreshSearch(e)); this.$tree.on("mousedown", ".refresh-search-button", e => this.refreshSearch(e));
@ -200,20 +201,16 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
this.$hideIncludedImages.prop("checked", this.hideIncludedImages); this.$hideIncludedImages.prop("checked", this.hideIncludedImages);
this.$autoCollapseNoteTree.prop("checked", this.autoCollapseNoteTree); this.$autoCollapseNoteTree.prop("checked", this.autoCollapseNoteTree);
let top = this.$treeSettingsButton[0].offsetTop; const top = this.$treeActions[0].offsetTop - (this.$treeSettingsPopup.outerHeight());
let left = this.$treeSettingsButton[0].offsetLeft; const left = Math.max(
top -= this.$treeSettingsPopup.outerHeight() + 10; 0,
left += this.$treeSettingsButton.outerWidth() - this.$treeSettingsPopup.outerWidth(); this.$treeActions[0].offsetLeft - this.$treeSettingsPopup.outerWidth() + this.$treeActions.outerWidth()
);
if (left < 0) {
left = 0;
}
this.$treeSettingsPopup.css({ this.$treeSettingsPopup.css({
display: "block", top,
top: top, left
left: left }).show();
}).addClass("show");
return false; return false;
}); });