From 82957296111c2bebfd1e14046bded24d0631ba70 Mon Sep 17 00:00:00 2001
From: Scharel Clemens <scharelc@gmail.com>
Date: Sun, 18 Nov 2018 15:01:32 +0100
Subject: [PATCH] Reload Note view after editing

---
 qml/pages/NotePage.qml | 49 ++++++++++++++++++++++++++++++------------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/qml/pages/NotePage.qml b/qml/pages/NotePage.qml
index 14d4e49..895732d 100644
--- a/qml/pages/NotePage.qml
+++ b/qml/pages/NotePage.qml
@@ -6,20 +6,37 @@ Dialog {
 
     acceptDestination: Qt.resolvedUrl("EditPage.qml")
     acceptDestinationProperties: { account: account; noteIndex: noteIndex }
-    Component.onCompleted: acceptDestinationProperties = { account: account, noteIndex: noteIndex }//acceptDestinationInstance.note = note
+    Component.onCompleted: acceptDestinationProperties = { account: account, noteIndex: noteIndex }
+    onStatusChanged: {
+        if (status === PageStatus.Active) {
+            dialogHeader.title = account.model.get(noteIndex).title
+            contentLabel.plainText = account.model.get(noteIndex).content
+            contentLabel.parse()
+        }
+    }
+    Connections {
+        target: account.model.get(noteIndex)
+        onTitleChanged: dialogHeader.title = account.model.get(noteIndex).title
+        onContentChanged: {
+            contentLabel.plainText = account.model.get(noteIndex).content
+            contentLabel.parse()
+        }
+    }
 
     property var account
     property int noteIndex
 
     property var markdown: [
-        { regex: new RegExp(/(^#\s)(.*)$/gm), replace: '<h1>$2</h1>' },
-        { regex: new RegExp(/(^##\s)(.*)$/gm), replace: '<h2>$2</h2>' },
-        { regex: new RegExp(/(^###\s)(.*)$/gm), replace: '<h3>$2</h3>' },
-        { regex: new RegExp(/(^####\s)(.*)$/gm), replace: '<h4>$2</h4>' },
-        { regex: new RegExp(/(^#####\s)(.*)$/gm), replace: '<h5>$2</h5>' },
-        { regex: new RegExp(/(^######\s)(.*)$/gm), replace: '<h6>$2</h6>' },
-        { regex: new RegExp(/(^-\s)(.*)$/gm), replace: '<ul><li>$2</li></ul>' },
-        { regex: new RegExp(/(^\d{1,}.\s)(.*)$/gm), replace: '<ol><li>$2</li></ol>' }
+        { regex: new RegExp(/^#\s(.*)$/gm), replace: '<h1>$1</h1>' },
+        { regex: new RegExp(/^##\s(.*)$/gm), replace: '<h2>$1</h2>' },
+        { regex: new RegExp(/^###\s(.*)$/gm), replace: '<h3>$1</h3>' },
+        { regex: new RegExp(/^####\s(.*)$/gm), replace: '<h4>$1</h4>' },
+        { regex: new RegExp(/^#####\s(.*)$/gm), replace: '<h5>$1</h5>' },
+        { regex: new RegExp(/^######\s(.*)$/gm), replace: '<h6>$1</h6>' },
+        { regex: new RegExp(/^-\s(.*)$/gm), replace: '<ul><li>$1</li></ul>' },
+        { regex: new RegExp(/^\d{1,}.\s(.*)$/gm), replace: '<ol><li>$1</li></ol>' },
+        //{ regex: new RegExp(/(<li class="ul">[\s\S]*<\/li>)/igm), replace: '<ul>$1</ul>' },
+        //{ regex: new RegExp(/(<li class="ol">[\s\S]*<\/li>)/igm), replace: '<ol>$1</ol>' }
     ]
 
     SilicaFlickable {
@@ -31,22 +48,26 @@ Dialog {
             width: parent.width
 
             DialogHeader {
-                title: account.model.get(noteIndex).title
+                id: dialogHeader
                 acceptText: qsTr("Edit")
                 cancelText: qsTr("Notes")
             }
 
             LinkedLabel {
+                id: contentLabel
                 x: Theme.horizontalPageMargin
                 width: parent.width - 2*x
                 textFormat: Text.StyledText
-                Component.onCompleted: {
-                    var lines = account.model.get(noteIndex).content.split('\n')
+
+                function parse() {
+                    var lines = plainText.split('\n')
                     lines.splice(0,1);
-                    text = lines.join('\n');
+                    var tmpText = lines.join('\n');
                     for (var i=0; i < markdown.length; i++) {
-                        text = text.replace(markdown[i].regex, markdown[i].replace)
+                        tmpText = tmpText.replace(markdown[i].regex, markdown[i].replace)
                     }
+                    text = tmpText
+                    console.log(text)
                 }
             }
         }