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

fix zen mode with attributes, closes #1213

Browse Source
This commit is contained in:
zadam 2020-09-04 22:54:50 +02:00
parent 29efe3a492
commit 0c72d29684
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/public/app/layouts/desktop_main_window_layout.js
View File

@ -15,7 +15,6 @@ import AttributeListWidget from "../widgets/attribute_list.js";
import RunScriptButtonsWidget from "../widgets/run_script_buttons.js"; import RunScriptButtonsWidget from "../widgets/run_script_buttons.js";
import NoteTypeWidget from "../widgets/note_type.js"; import NoteTypeWidget from "../widgets/note_type.js";
import NoteActionsWidget from "../widgets/note_actions.js"; import NoteActionsWidget from "../widgets/note_actions.js";
import PromotedAttributesWidget from "../widgets/promoted_attributes.js";
import NoteDetailWidget from "../widgets/note_detail.js"; import NoteDetailWidget from "../widgets/note_detail.js";
import NoteInfoWidget from "../widgets/collapsible_widgets/note_info.js"; import NoteInfoWidget from "../widgets/collapsible_widgets/note_info.js";
import CalendarWidget from "../widgets/collapsible_widgets/calendar.js"; import CalendarWidget from "../widgets/collapsible_widgets/calendar.js";

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

@ -156,7 +156,9 @@ async function consumeSyncData() {
logError(`Encountered error ${e.message}: ${e.stack}, reloading frontend.`); logError(`Encountered error ${e.message}: ${e.stack}, reloading frontend.`);
// if there's an error in updating the frontend then the easy option to recover is to reload the frontend completely // if there's an error in updating the frontend then the easy option to recover is to reload the frontend completely
utils.reloadApp(); if (!glob.isDev) {
utils.reloadApp();
}
} }
for (const syncRow of nonProcessedSyncRows) { for (const syncRow of nonProcessedSyncRows) {

2
src/public/app/widgets/collapsible_widgets/similar_notes.js
View File

@ -66,4 +66,4 @@ export default class SimilarNotesWidget extends CollapsibleWidget {
this.refresh(); this.refresh();
} }
} }
} }

1
src/public/app/widgets/note_title.js
View File

@ -9,6 +9,7 @@ const TPL = `
<style> <style>
.note-title-container { .note-title-container {
flex-grow: 100; flex-grow: 100;
height: 34px;
} }
.note-title-container input.note-title { .note-title-container input.note-title {

5
src/services/backend_script_api.js
View File

@ -10,7 +10,6 @@ const repository = require('./repository');
const axios = require('axios'); const axios = require('axios');
const dayjs = require('dayjs'); const dayjs = require('dayjs');
const cloningService = require('./cloning'); const cloningService = require('./cloning');
const ws = require('./ws.js');
const appInfo = require('./app_info'); const appInfo = require('./app_info');
const searchService = require('./search/services/search.js'); const searchService = require('./search/services/search.js');
@ -88,7 +87,7 @@ function BackendScriptApi(currentNote, apiParams) {
/** /**
* This is a powerful search method - you can search by attributes and their values, e.g.: * This is a powerful search method - you can search by attributes and their values, e.g.:
* "@dateModified =* MONTH AND @log". See full documentation for all options at: https://github.com/zadam/trilium/wiki/Search * "#dateModified =* MONTH AND #log". See full documentation for all options at: https://github.com/zadam/trilium/wiki/Search
* *
* @method * @method
* @param {string} searchString * @param {string} searchString
@ -98,7 +97,7 @@ function BackendScriptApi(currentNote, apiParams) {
/** /**
* This is a powerful search method - you can search by attributes and their values, e.g.: * This is a powerful search method - you can search by attributes and their values, e.g.:
* "@dateModified =* MONTH AND @log". See full documentation for all options at: https://github.com/zadam/trilium/wiki/Search * "#dateModified =* MONTH AND #log". See full documentation for all options at: https://github.com/zadam/trilium/wiki/Search
* *
* @method * @method
* @param {string} searchString * @param {string} searchString