gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
zadam 2020-02-28 00:31:12 +01:00
parent 2af37640d8
commit cb35284d37
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/public/javascripts/services/tab_manager.js
View File

@ -192,7 +192,10 @@ export default class TabManager extends Component {
if (activate) { if (activate) {
this.activateTab(tabContext.tabId, false); this.activateTab(tabContext.tabId, false);
this.triggerEvent('tabNoteSwitchedAndActivated'); this.triggerEvent('tabNoteSwitchedAndActivated', {
tabId: tabContext.tabId,
notePath
});
} }
} }

6
src/public/javascripts/widgets/search_box.js
View File

@ -70,7 +70,7 @@ export default class SearchBoxWidget extends BasicWidget {
this.$saveSearchButton.on('click', () => this.saveSearch()); this.$saveSearchButton.on('click', () => this.saveSearch());
this.$closeSearchButton.on('click', () => this.triggerCommand('hideSearch')); this.$closeSearchButton.on('click', () => this.hideSearch());
return this.$widget; return this.$widget;
} }
@ -142,7 +142,7 @@ export default class SearchBoxWidget extends BasicWidget {
this.$searchInput.trigger('focus'); this.$searchInput.trigger('focus');
} }
hideSearchEvent() { hideSearch() {
this.resetSearchEvent(); this.resetSearchEvent();
this.$searchBox.slideUp(); this.$searchBox.slideUp();
@ -155,7 +155,7 @@ export default class SearchBoxWidget extends BasicWidget {
this.showSearchEvent(); this.showSearchEvent();
} }
else { else {
this.hideSearchEvent(); this.hideSearch();
} }
} }

4
src/public/javascripts/widgets/tab_aware_widget.js
View File

@ -79,11 +79,13 @@ export default class TabAwareWidget extends BasicWidget {
} }
// when note is both switched and activated, this should not produce double refresh // when note is both switched and activated, this should not produce double refresh
async tabNoteSwitchedAndActivatedEvent() { async tabNoteSwitchedAndActivatedEvent({tabId, notePath}) {
if (this.isTab(tabId) && this.notePath === notePath) {
this.tabContext = appContext.tabManager.getActiveTabContext(); this.tabContext = appContext.tabManager.getActiveTabContext();
await this.refresh(); await this.refresh();
} }
}
async treeCacheReloadedEvent() { async treeCacheReloadedEvent() {
await this.refresh(); await this.refresh();

8
src/public/javascripts/widgets/tab_row.js
View File

@ -575,7 +575,15 @@ export default class TabRowWidget extends BasicWidget {
return closestIndex; return closestIndex;
}; };
tabNoteSwitchedAndActivatedEvent({tabId}) {
this.updateTabById(tabId);
}
tabNoteSwitchedEvent({tabId}) { tabNoteSwitchedEvent({tabId}) {
this.updateTabById(tabId);
}
updateTabById(tabId) {
const $tab = this.getTabById(tabId); const $tab = this.getTabById(tabId);
const {note} = appContext.tabManager.getTabContextById(tabId); const {note} = appContext.tabManager.getTabContextById(tabId);