release 0.12.0

package.json

@@ -1,7 +1,7 @@
 {
   "name": "trilium",
   "description": "Trilium Notes",
-  "version": "0.11.1",
+  "version": "0.12.0",
   "license": "AGPL-3.0-only",
   "main": "electron.js",
   "repository": {

src/public/javascripts/dialogs/add_link.js

@@ -45,8 +45,8 @@ async function showDialog() {
     $clonePrefix.val('');
     $linkTitle.val('');
 
-    function setDefaultLinkTitle(noteId) {
-        const noteTitle = treeUtils.getNoteTitle(noteId);
+    async function setDefaultLinkTitle(noteId) {
+        const noteTitle = await treeUtils.getNoteTitle(noteId);
 
         $linkTitle.val(noteTitle);
     }
@@ -54,7 +54,7 @@ async function showDialog() {
     $autoComplete.autocomplete({
         source: await autocompleteService.getAutocompleteItems(),
         minLength: 0,
-        change: () => {
+        change: async () => {
             const val = $autoComplete.val();
             const notePath = linkService.getNodePathFromLabel(val);
             if (!notePath) {
@@ -64,16 +64,16 @@ async function showDialog() {
             const noteId = treeUtils.getNoteIdFromNotePath(notePath);
 
             if (noteId) {
-                setDefaultLinkTitle(noteId);
+                await setDefaultLinkTitle(noteId);
             }
         },
         // this is called when user goes through autocomplete list with keyboard
         // at this point the item isn't selected yet so we use supplied ui.item to see WHERE the cursor is
-        focus: (event, ui) => {
+        focus: async (event, ui) => {
             const notePath = linkService.getNodePathFromLabel(ui.item.value);
             const noteId = treeUtils.getNoteIdFromNotePath(notePath);
 
-            setDefaultLinkTitle(noteId);
+            await setDefaultLinkTitle(noteId);
         }
     });
 }

src/public/javascripts/services/link.js

@@ -76,9 +76,11 @@ function goToLink(e) {
 
 function addLinkToEditor(linkTitle, linkHref) {
     const editor = noteDetailText.getEditor();
-    const doc = editor.document;
 
-    doc.enqueueChanges(() => editor.data.insertLink(linkTitle, linkHref), doc.selection);
+    editor.model.change( writer => {
+        const insertPosition = editor.model.document.selection.getFirstPosition();
+        writer.insertText(linkTitle, { linkHref: linkHref }, insertPosition);
+    });
 }
 
 function addTextToEditor(text) {

src/public/javascripts/services/note_detail_code.js

@@ -31,7 +31,8 @@ async function show() {
             highlightSelectionMatches: {showToken: /\w/, annotateScrollbar: false},
             lint: true,
             gutters: ["CodeMirror-lint-markers"],
-            lineNumbers: true
+            lineNumbers: true,
+            tabindex: 2 // so that tab from title will lead to code editor focus
         });
 
         codeEditor.on('change', noteDetailService.noteChanged);

src/public/javascripts/services/note_detail_text.js

@@ -11,11 +11,10 @@ async function show() {
 
         textEditor = await BalloonEditor.create($noteDetailText[0], {});
 
-        textEditor.document.on('change', noteDetailService.noteChanged);
+        textEditor.model.document.on('change', noteDetailService.noteChanged);
     }
 
-    // temporary workaround for https://github.com/ckeditor/ckeditor5-enter/issues/49
-    textEditor.setData(noteDetailService.getCurrentNote().content || "<p></p>");
+    textEditor.setData(noteDetailService.getCurrentNote().content);
 
     $noteDetailText.show();
 }

src/public/javascripts/services/tree.js

@@ -541,9 +541,9 @@ $(window).bind('hashchange', function() {
 });
 
 utils.bindShortcut('alt+c', () => collapseTree()); // don't use shortened form since collapseTree() accepts argument
+$collapseTreeButton.click(() => collapseTree());
 
 $createTopLevelNoteButton.click(createNewTopLevelNote);
-$collapseTreeButton.click(collapseTree);
 $scrollToCurrentNoteButton.click(scrollToCurrentNote);
 
 export default {

src/public/libraries/fancytree/skin-win8/ui.fancytree.css

@@ -12,9 +12,40 @@
 /*------------------------------------------------------------------------------
  * Helpers
  *----------------------------------------------------------------------------*/
-.ui-helper-hidden {
+.fancytree-helper-hidden {
   display: none;
 }
+.fancytree-helper-indeterminate-cb {
+  color: #777;
+}
+.fancytree-helper-disabled {
+  color: #c0c0c0;
+}
+/* Helper to allow spinning loader icon with glyph-, ligature-, and SVG-icons. */
+.fancytree-helper-spin {
+  -webkit-animation: spin 1000ms infinite linear;
+  animation: spin 1000ms infinite linear;
+}
+@-webkit-keyframes spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
+}
+@keyframes spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
+}
 /*------------------------------------------------------------------------------
  * Container and UL / LI
  *----------------------------------------------------------------------------*/
@@ -338,6 +369,16 @@ span.fancytree-node.fancytree-error span.fancytree-title {
 /*------------------------------------------------------------------------------
  * Drag'n'drop support
  *----------------------------------------------------------------------------*/
+/* ext-dnd5: */
+span.fancytree-childcounter {
+  color: #fff;
+  background: #337ab7;
+  border: 1px solid gray;
+  border-radius: 10px;
+  padding: 2px;
+  text-align: center;
+}
+/* ext-dnd: */
 div.fancytree-drag-helper span.fancytree-childcounter,
 div.fancytree-drag-helper span.fancytree-dnd-modifier {
   display: inline-block;
@@ -402,8 +443,7 @@ span.fancytree-drag-source.fancytree-drag-remove {
 .fancytree-container.fancytree-rtl span.fancytree-connector,
 .fancytree-container.fancytree-rtl span.fancytree-expander,
 .fancytree-container.fancytree-rtl span.fancytree-icon,
-.fancytree-container.fancytree-rtl span.fancytree-drag-helper-img,
-.fancytree-container.fancytree-rtl #fancytree-drop-marker {
+.fancytree-container.fancytree-rtl span.fancytree-drag-helper-img {
   background-image: url("../skin-win8/icons-rtl.gif");
 }
 .fancytree-container.fancytree-rtl .fancytree-exp-n span.fancytree-expander,
@@ -425,6 +465,9 @@ ul.fancytree-container.fancytree-rtl li.fancytree-lastsib,
 ul.fancytree-container.fancytree-rtl.fancytree-no-connector > li {
   background-image: none;
 }
+#fancytree-drop-marker.fancytree-rtl {
+  background-image: url("../skin-win8/icons-rtl.gif");
+}
 /*------------------------------------------------------------------------------
  * 'table' extension
  *----------------------------------------------------------------------------*/
@@ -482,7 +525,7 @@ table.fancytree-ext-columnview .fancytree-has-children span.fancytree-cv-right:h
  * 'filter' extension
  *----------------------------------------------------------------------------*/
 .fancytree-ext-filter-dimm span.fancytree-node span.fancytree-title {
-  color: silver;
+  color: #c0c0c0;
   font-weight: lighter;
 }
 .fancytree-ext-filter-dimm tr.fancytree-submatch span.fancytree-title,
@@ -501,7 +544,7 @@ table.fancytree-ext-columnview .fancytree-has-children span.fancytree-cv-right:h
 }
 .fancytree-ext-filter-hide tr.fancytree-submatch span.fancytree-title,
 .fancytree-ext-filter-hide span.fancytree-node.fancytree-submatch span.fancytree-title {
-  color: silver;
+  color: #c0c0c0;
   font-weight: lighter;
 }
 .fancytree-ext-filter-hide tr.fancytree-match span.fancytree-title,

src/public/stylesheets/style.css

@@ -4,18 +4,12 @@
 
     display: grid;
     grid-template-areas: "header header"
-                         "tree-actions title"
-                         "search note-detail"
-                         "tree note-detail"
-                         "parent-list note-detail"
-                         "parent-list label-list";
+                         "left-pane title"
+                         "left-pane note-detail";
     grid-template-columns: 2fr 5fr;
     grid-template-rows: auto
                         auto
-                        auto
-                        1fr
-                        auto
-                        auto;
+                        1fr;
 
     justify-content: center;
     grid-gap: 10px;
@@ -28,6 +22,23 @@
     align-items: center;
 }
 
+#note-detail-wrapper {
+    position: relative;
+    overflow: hidden;
+    grid-area: note-detail;
+    padding-left: 10px;
+    padding-top: 10px;
+    display: flex;
+    flex-direction: column;
+}
+
+#note-detail-component-wrapper {
+    flex-grow: 1;
+    position: relative;
+    overflow: auto;
+    flex-basis: content;
+}
+
 .note-detail-component {
     display: none;
 }
@@ -274,7 +285,6 @@ div.ui-tooltip {
 .cm-matchhighlight {background-color: #eeeeee}
 
 #label-list {
-    grid-area: label-list;
     color: #777777;
     border-top: 1px solid #eee;
     padding: 5px; display: none;

src/routes/api/sync.js

@@ -68,7 +68,7 @@ async function update(req) {
     const entities = req.body.entities;
 
     for (const {sync, entity} of entities) {
-        await syncUpdateService.updateEntity(sync.entityName, entity, sourceId);
+        await syncUpdateService.updateEntity(sync, entity, sourceId);
     }
 }
 

src/services/build.js

@@ -1 +1 @@
-module.exports = { buildDate:"2018-04-11T00:10:33-04:00", buildRevision: "a4eafb934ff3cdb46dbc138b1b02850872948699" };
+module.exports = { buildDate:"2018-04-14T08:28:50-04:00", buildRevision: "d57057ba28d2d93ffaeed15900116836fc791968" };

src/services/consistency_checks.js

@@ -197,16 +197,6 @@ async function runAllChecks() {
             AND images.isDeleted = 1`,
         "Note image is not deleted while image is deleted for noteImageId", errorList);
 
-    await runCheck(`
-          SELECT 
-            noteId
-          FROM 
-            notes
-          WHERE 
-            isDeleted = 0
-            AND (title IS NULL OR content IS NULL)`,
-        "Note has null title or text", errorList);
-
     await runCheck(`
           SELECT 
             noteId

src/services/sync.js

@@ -101,7 +101,7 @@ async function pullSync(syncContext) {
             log.info(`Skipping pull #${sync.id} ${sync.entityName} ${sync.entityId} because ${sync.sourceId} is a local source id.`);
         }
         else {
-            await syncUpdateService.updateEntity(sync.entityName, entity, syncContext.sourceId);
+            await syncUpdateService.updateEntity(sync, entity, syncContext.sourceId);
         }
 
         await setLastSyncedPull(sync.id);

src/services/sync_update.js

@@ -3,7 +3,9 @@ const log = require('./log');
 const eventLogService = require('./event_log');
 const syncTableService = require('./sync_table');
 
-async function updateEntity(entityName, entity, sourceId) {
+async function updateEntity(sync, entity, sourceId) {
+    const {entityName} = sync;
+
     if (entityName === 'notes') {
         await updateNote(entity, sourceId);
     }
@@ -14,7 +16,7 @@ async function updateEntity(entityName, entity, sourceId) {
         await updateNoteRevision(entity, sourceId);
     }
     else if (entityName === 'note_reordering') {
-        await updateNoteReordering(entity, sourceId);
+        await updateNoteReordering(sync.entityId, entity, sourceId);
     }
     else if (entityName === 'options') {
         await updateOptions(entity, sourceId);
@@ -35,7 +37,7 @@ async function updateEntity(entityName, entity, sourceId) {
         await updateApiToken(entity, sourceId);
     }
     else {
-        throw new Error(`Unrecognized entity type ${entityName}`);
+        throw new Error(`Unrecognized entity type ${sync}`);
     }
 }
 
@@ -94,13 +96,13 @@ async function updateNoteRevision(entity, sourceId) {
     });
 }
 
-async function updateNoteReordering(entity, sourceId) {
+async function updateNoteReordering(entityId, entity, sourceId) {
     await sql.transactional(async () => {
-        Object.keys(entity.ordering).forEach(async key => {
-            await sql.execute("UPDATE branches SET notePosition = ? WHERE branchId = ?", [entity.ordering[key], key]);
+        Object.keys(entity).forEach(async key => {
+            await sql.execute("UPDATE branches SET notePosition = ? WHERE branchId = ?", [entity[key], key]);
         });
 
-        await syncTableService.addNoteReorderingSync(entity.parentNoteId, sourceId);
+        await syncTableService.addNoteReorderingSync(entityId, sourceId);
     });
 }
 

src/views/index.ejs

@@ -38,7 +38,7 @@
         </div>
       </div>
 
-      <div class="hide-toggle" style="grid-area: tree-actions;">
+      <div style="grid-area: left-pane; display: flex; flex-direction: column;" class="hide-toggle">
         <div style="display: flex; justify-content: space-around; padding: 10px 0 10px 0; margin: 0 20px 0 20px; border: 1px solid #ccc;">
           <a id="create-top-level-note-button" title="Create new top level note" class="icon-action"
              style="background: url('/images/icons/file-plus.png')"></a>
@@ -54,28 +54,28 @@
         </div>
 
         <input type="file" id="import-upload" style="display: none" />
-      </div>
 
-      <div id="search-box" class="hide-toggle" style="grid-area: search; display: none; padding: 10px; margin-top: 10px;">
-        <div style="display: flex; align-items: center;">
-          <input name="search-text" placeholder="Search text, labels" style="flex-grow: 100; margin-left: 5px; margin-right: 5px;" autocomplete="off">
-          <button id="do-search-button" class="btn btn-primary btn-sm" title="Search">Search</button>
+        <div id="search-box" style="display: none; padding: 10px; margin-top: 10px;">
+          <div style="display: flex; align-items: center;">
+            <input name="search-text" placeholder="Search text, labels" style="flex-grow: 100; margin-left: 5px; margin-right: 5px;" autocomplete="off">
+            <button id="do-search-button" class="btn btn-primary btn-sm" title="Search">Search</button>
+          </div>
+
+          <div style="display: flex; align-items: center; justify-content: space-evenly; margin-top: 10px;">
+            <button id="reset-search-button" class="btn btn-sm" title="Reset search">Reset search</button>
+
+            <button id="save-search-button" class="btn btn-sm" title="Save search">Save search</button>
+          </div>
         </div>
 
-        <div style="display: flex; align-items: center; justify-content: space-evenly; margin-top: 10px;">
-          <button id="reset-search-button" class="btn btn-sm" title="Reset search">Reset search</button>
-
-          <button id="save-search-button" class="btn btn-sm" title="Save search">Save search</button>
+        <div id="tree" class="hide-toggle" style="overflow: auto; flex-grow: 100; flex-shrink: 100; margin-top: 10px;">
         </div>
-      </div>
 
-      <div id="tree" class="hide-toggle" style="grid-area: tree; overflow: auto;">
-      </div>
+        <div id="parent-list">
+          <p><strong>Note locations:</strong></p>
 
-      <div id="parent-list" class="hide-toggle">
-        <p><strong>Note locations:</strong></p>
-
-        <ul id="parent-list-inner"></ul>
+          <ul id="parent-list-inner"></ul>
+        </div>
       </div>
 
       <div class="hide-toggle" style="grid-area: title;">
@@ -132,9 +132,9 @@
         </div>
       </div>
 
-      <div style="position: relative; overflow: hidden; grid-area: note-detail; padding-left: 10px; padding-top: 10px; display: flex; flex-direction: column;" id="note-detail-wrapper">
-        <div style="flex-grow: 1; position: relative; overflow: auto; flex-basis: content;">
-          <div id="note-detail-text" style="height: 100%;" class="note-detail-component"></div>
+      <div  id="note-detail-wrapper">
+        <div id="note-detail-component-wrapper">
+          <div id="note-detail-text" class="note-detail-component" tabindex="2"></div>
 
           <div id="note-detail-search" class="note-detail-component">
             <div style="display: flex; align-items: center;">
@@ -206,12 +206,12 @@
         </div>
 
         <div id="children-overview"></div>
-      </div>
 
-      <div id="label-list">
-        <button class="btn btn-sm show-labels-button">Labels:</button>
+        <div id="label-list">
+          <button class="btn btn-sm show-labels-button">Labels:</button>
 
-        <span id="label-list-inner"></span>
+          <span id="label-list-inner"></span>
+        </div>
       </div>
     </div>