From 0c72d29684b58848f9731d7aebe76eecafea9aaa Mon Sep 17 00:00:00 2001
From: zadam <adam.zivner@gmail.com>
Date: Fri, 4 Sep 2020 22:54:50 +0200
Subject: [PATCH] fix zen mode with attributes, closes #1213

---
 src/public/app/layouts/desktop_main_window_layout.js        | 1 -
 src/public/app/services/ws.js                               | 4 +++-
 src/public/app/widgets/collapsible_widgets/similar_notes.js | 2 +-
 src/public/app/widgets/note_title.js                        | 1 +
 src/services/backend_script_api.js                          | 5 ++---
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/public/app/layouts/desktop_main_window_layout.js b/src/public/app/layouts/desktop_main_window_layout.js
index 9ebfd199a..7b4299700 100644
--- a/src/public/app/layouts/desktop_main_window_layout.js
+++ b/src/public/app/layouts/desktop_main_window_layout.js
@@ -15,7 +15,6 @@ import AttributeListWidget from "../widgets/attribute_list.js";
 import RunScriptButtonsWidget from "../widgets/run_script_buttons.js";
 import NoteTypeWidget from "../widgets/note_type.js";
 import NoteActionsWidget from "../widgets/note_actions.js";
-import PromotedAttributesWidget from "../widgets/promoted_attributes.js";
 import NoteDetailWidget from "../widgets/note_detail.js";
 import NoteInfoWidget from "../widgets/collapsible_widgets/note_info.js";
 import CalendarWidget from "../widgets/collapsible_widgets/calendar.js";
diff --git a/src/public/app/services/ws.js b/src/public/app/services/ws.js
index bbdb7acec..69d868116 100644
--- a/src/public/app/services/ws.js
+++ b/src/public/app/services/ws.js
@@ -156,7 +156,9 @@ async function consumeSyncData() {
             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
-            utils.reloadApp();
+            if (!glob.isDev) {
+                utils.reloadApp();
+            }
         }
 
         for (const syncRow of nonProcessedSyncRows) {
diff --git a/src/public/app/widgets/collapsible_widgets/similar_notes.js b/src/public/app/widgets/collapsible_widgets/similar_notes.js
index 45a3a27d8..708c6a0ac 100644
--- a/src/public/app/widgets/collapsible_widgets/similar_notes.js
+++ b/src/public/app/widgets/collapsible_widgets/similar_notes.js
@@ -66,4 +66,4 @@ export default class SimilarNotesWidget extends CollapsibleWidget {
             this.refresh();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/public/app/widgets/note_title.js b/src/public/app/widgets/note_title.js
index 145417dde..222892fbf 100644
--- a/src/public/app/widgets/note_title.js
+++ b/src/public/app/widgets/note_title.js
@@ -9,6 +9,7 @@ const TPL = `
     <style>
     .note-title-container {
         flex-grow: 100;
+        height: 34px;
     }
     
     .note-title-container input.note-title {
diff --git a/src/services/backend_script_api.js b/src/services/backend_script_api.js
index 7d0f748c5..799bee071 100644
--- a/src/services/backend_script_api.js
+++ b/src/services/backend_script_api.js
@@ -10,7 +10,6 @@ const repository = require('./repository');
 const axios = require('axios');
 const dayjs = require('dayjs');
 const cloningService = require('./cloning');
-const ws = require('./ws.js');
 const appInfo = require('./app_info');
 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.:
-     * "@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
      * @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.:
-     * "@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
      * @param {string} searchString