From 3c8aa0ffc8c787f774bbcb6c5af2c7ed54fbb1be Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Sat, 15 Apr 2017 20:22:03 +0300
Subject: [PATCH] Comments are saved in the isolated note
---
.../elements/comment/CommentComponent.js | 2 +-
.../SimpleEditor/panes/Notes/Notes.js | 18 ++++++++++--------
.../SimpleEditor/panes/Notes/NotesProvider.js | 12 +++---------
3 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/app/components/SimpleEditor/elements/comment/CommentComponent.js b/app/components/SimpleEditor/elements/comment/CommentComponent.js
index 93a16e0..ebae78e 100644
--- a/app/components/SimpleEditor/elements/comment/CommentComponent.js
+++ b/app/components/SimpleEditor/elements/comment/CommentComponent.js
@@ -10,7 +10,7 @@ class CommentComponent extends AnnotationComponent {
const { node } = this.props
const active = node.active
- var el = $$('span')
+ var el = $$('comment')
.attr('data-id', this.props.node.id)
.addClass(this.getClassNames())
diff --git a/app/components/SimpleEditor/panes/Notes/Notes.js b/app/components/SimpleEditor/panes/Notes/Notes.js
index 29ec535..c2826f0 100644
--- a/app/components/SimpleEditor/panes/Notes/Notes.js
+++ b/app/components/SimpleEditor/panes/Notes/Notes.js
@@ -17,13 +17,6 @@ class Notes extends Component {
didMount () {
const provider = this.getProvider()
this.context.editorSession.onUpdate('document', this.onNotesUpdated, this)
-
- const notes = provider.computeEntries()
-
- for (var i = 0; i < notes.main.length; i++) {
- provider.createIsolatedNote(notes.main[i])
- }
-
provider.config.miniEditorSession.onUpdate('document', this.saveNotes, this)
}
@@ -78,7 +71,16 @@ class Notes extends Component {
const importer = configurator.createImporter('html')
- const doc = importer.importDocument('')
+ const provider = this.getProvider()
+
+ const notes = provider.computeEntries()
+ let noteContent = ''
+
+ for (var i = 0; i < notes.main.length; i++) {
+ noteContent += notes.main[i]['note-content']
+ }
+
+ const doc = importer.importDocument(noteContent)
const editorSession = new EditorSession(doc, {
configurator: configurator
diff --git a/app/components/SimpleEditor/panes/Notes/NotesProvider.js b/app/components/SimpleEditor/panes/Notes/NotesProvider.js
index b3f1cfe..613dced 100644
--- a/app/components/SimpleEditor/panes/Notes/NotesProvider.js
+++ b/app/components/SimpleEditor/panes/Notes/NotesProvider.js
@@ -62,23 +62,17 @@ class NotesProvider extends TOCProvider {
let notes = _.clone(nodes)
if (this.config.miniEditorSession === '') return
- // const doc = this.config.miniEditorSession.document
notes = _.map(notes, function (note) {
- // const blockId = note.path[0]
- // const blockPosition = container.getPosition(blockId)
- // const nodePosition = note.start.offset
+ const element = document.querySelector('p[data-path="' + note.id + '.content"]')
+ const noteContent = '<isolated-note data-id="' + note.id + '" data-type="isolated-note">' + element.innerHTML + '</isolated-note>'
return {
id: note.id,
- content: note.content,
+ content: noteContent,
parentNoteId: note.parentNoteId
- // blockPosition: blockPosition,
- // nodePosition: nodePosition,
- // node: note
}
})
return notes
- // return _.sortBy(notes, ['blockPosition', 'nodePosition'])
}
showNote (note) {
--
GitLab