From 1ece9b71ecb119901ca3a5e4d939bde6d2dd2a4f Mon Sep 17 00:00:00 2001
From: azivner <adam.zivner@gmail.com>
Date: Wed, 29 Aug 2018 20:22:57 +0200
Subject: [PATCH] fix inserting current timestamp into editor

---
 src/public/javascripts/dialogs/attributes.js  | 2 +-
 src/public/javascripts/services/link.js       | 6 ++++--
 src/public/javascripts/services/tree_utils.js | 4 ++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/public/javascripts/dialogs/attributes.js b/src/public/javascripts/dialogs/attributes.js
index 9cab0d29a..aeed6bdfd 100644
--- a/src/public/javascripts/dialogs/attributes.js
+++ b/src/public/javascripts/dialogs/attributes.js
@@ -149,7 +149,7 @@ function AttributesModel() {
                 attr.value = attr.labelValue;
             }
             else if (attr.type === 'relation') {
-                attr.value = treeUtils.getNoteIdFromNotePath(linkService.getNotePathFromLabel(attr.relationValue));
+                attr.value = treeUtils.getNoteIdFromNotePath(linkService.getNotePathFromLabel(attr.relationValue)) || "";
             }
             else if (attr.type === 'label-definition') {
                 attr.value = attr.labelDefinition;
diff --git a/src/public/javascripts/services/link.js b/src/public/javascripts/services/link.js
index 8dec90f8a..8f6a15461 100644
--- a/src/public/javascripts/services/link.js
+++ b/src/public/javascripts/services/link.js
@@ -85,9 +85,11 @@ function addLinkToEditor(linkTitle, linkHref) {
 
 function addTextToEditor(text) {
     const editor = noteDetailText.getEditor();
-    const doc = editor.document;
 
-    doc.enqueueChanges(() => editor.data.insertText(text), doc.selection);
+    editor.model.change(writer => {
+        const insertPosition = editor.model.document.selection.getFirstPosition();
+        writer.insertText(text, insertPosition);
+    });
 }
 
 ko.bindingHandlers.noteLink = {
diff --git a/src/public/javascripts/services/tree_utils.js b/src/public/javascripts/services/tree_utils.js
index e708ff845..64a0dd5b6 100644
--- a/src/public/javascripts/services/tree_utils.js
+++ b/src/public/javascripts/services/tree_utils.js
@@ -12,6 +12,10 @@ function getNodeByKey(key) {
 }
 
 function getNoteIdFromNotePath(notePath) {
+    if (!notePath) {
+        return null;
+    }
+
     const path = notePath.split("/");
 
     return path[path.length - 1];