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

fix zen mode

Browse Source
This commit is contained in:
zadam 2020-03-01 19:16:30 +01:00
parent 03e0c98066
commit 687539cc95
5 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/public/javascripts/dialogs/options/appearance.js
View File

@ -82,7 +82,6 @@ export default class ApperanceOptions {
this.$treeFontSize = $("#tree-font-size"); this.$treeFontSize = $("#tree-font-size");
this.$detailFontSize = $("#detail-font-size"); this.$detailFontSize = $("#detail-font-size");
this.$body = $("body"); this.$body = $("body");
this.$container = $("#container");
this.$themeSelect.on('change', () => { this.$themeSelect.on('change', () => {
const newTheme = this.$themeSelect.val(); const newTheme = this.$themeSelect.val();

4
src/public/javascripts/services/entrypoints.js
View File

@ -114,13 +114,13 @@ export default class Entrypoints extends Component {
toggleZenModeCommand() { toggleZenModeCommand() {
if (!this.zenModeActive) { if (!this.zenModeActive) {
$(".hide-in-zen-mode,.gutter").addClass("hidden-by-zen-mode"); $(".hide-in-zen-mode,.gutter").addClass("hidden-by-zen-mode");
$("#container").addClass("zen-mode"); $("#root-widget").addClass("zen-mode");
this.zenModeActive = true; this.zenModeActive = true;
} }
else { else {
// not hiding / showing explicitly since element might be hidden also for other reasons // not hiding / showing explicitly since element might be hidden also for other reasons
$(".hide-in-zen-mode,.gutter").removeClass("hidden-by-zen-mode"); $(".hide-in-zen-mode,.gutter").removeClass("hidden-by-zen-mode");
$("#container").removeClass("zen-mode"); $("#root-widget").removeClass("zen-mode");
this.zenModeActive = false; this.zenModeActive = false;
} }
} }

2
src/public/javascripts/services/protected_session.js
View File

@ -42,8 +42,6 @@ async function setupProtectedSession(password) {
return; return;
} }
$("#container").addClass('protected-session-active');
protectedSessionHolder.setProtectedSessionId(response.protectedSessionId); protectedSessionHolder.setProtectedSessionId(response.protectedSessionId);
protectedSessionHolder.touchProtectedSession(); protectedSessionHolder.touchProtectedSession();

5
src/public/javascripts/widgets/basic_widget.js
View File

@ -31,6 +31,11 @@ class BasicWidget extends Component {
return this; return this;
} }
hideInZenMode() {
this.class('hide-in-zen-mode');
return this;
}
cssBlock(block) { cssBlock(block) {
this.cssEl = block; this.cssEl = block;
return this; return this;

23
src/public/javascripts/widgets/desktop_layout.js
View File

@ -105,9 +105,12 @@ export default class DesktopLayout {
.child(new GlobalMenuWidget()) .child(new GlobalMenuWidget())
.child(new TabRowWidget()) .child(new TabRowWidget())
.child(new TitleBarButtonsWidget())) .child(new TitleBarButtonsWidget()))
.child(new StandardTopWidget()) .child(new StandardTopWidget()
.child(new FlexContainer('row').collapsible() .hideInZenMode())
.child(new FlexContainer('row')
.collapsible()
.child(new SidePaneContainer('left') .child(new SidePaneContainer('left')
.hideInZenMode()
.child(new GlobalButtonsWidget()) .child(new GlobalButtonsWidget())
.child(new SearchBoxWidget()) .child(new SearchBoxWidget())
.child(new SearchResultsWidget()) .child(new SearchResultsWidget())
@ -116,17 +119,19 @@ export default class DesktopLayout {
.child(new FlexContainer('column').id('center-pane') .child(new FlexContainer('column').id('center-pane')
.child(new FlexContainer('row').class('title-row') .child(new FlexContainer('row').class('title-row')
.cssBlock('.title-row > * { margin: 5px; }') .cssBlock('.title-row > * { margin: 5px; }')
.child(new TabCachingWidget(() => new NotePathsWidget())) .child(new TabCachingWidget(() => new NotePathsWidget()).hideInZenMode())
.child(new NoteTitleWidget()) .child(new NoteTitleWidget())
.child(new RunScriptButtonsWidget()) .child(new RunScriptButtonsWidget().hideInZenMode())
.child(new ProtectedNoteSwitchWidget()) .child(new ProtectedNoteSwitchWidget().hideInZenMode())
.child(new NoteTypeWidget()) .child(new NoteTypeWidget().hideInZenMode())
.child(new NoteActionsWidget()) .child(new NoteActionsWidget().hideInZenMode())
) )
.child(new TabCachingWidget(() => new PromotedAttributesWidget())) .child(new TabCachingWidget(() => new PromotedAttributesWidget()))
.child(new TabCachingWidget(() => new NoteDetailWidget())) .child(new TabCachingWidget(() => new NoteDetailWidget()))
) )
.child(new SidePaneContainer('right').cssBlock(RIGHT_PANE_CSS) .child(new SidePaneContainer('right')
.cssBlock(RIGHT_PANE_CSS)
.hideInZenMode()
.child(new NoteInfoWidget()) .child(new NoteInfoWidget())
.child(new TabCachingWidget(() => new CalendarWidget())) .child(new TabCachingWidget(() => new CalendarWidget()))
.child(new TabCachingWidget(() => new AttributesWidget())) .child(new TabCachingWidget(() => new AttributesWidget()))
@ -135,7 +140,7 @@ export default class DesktopLayout {
.child(new TabCachingWidget(() => new SimilarNotesWidget())) .child(new TabCachingWidget(() => new SimilarNotesWidget()))
.child(new TabCachingWidget(() => new WhatLinksHereWidget())) .child(new TabCachingWidget(() => new WhatLinksHereWidget()))
) )
.child(new SidePaneToggles()) .child(new SidePaneToggles().hideInZenMode())
); );
} }
} }