From b533d913d6632d848aa8a62fae3a20069edef956 Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Tue, 11 Apr 2017 11:41:33 +0300
Subject: [PATCH] comments work in miniEditor
---
.../SimpleEditor/miniEditor/miniEditor.js | 8 +++--
.../SimpleEditor/panes/Comments/CommentBox.js | 1 +
.../SimpleEditor/panes/Notes/Notes.js | 32 ++++++++++++++++---
.../SimpleEditor/panes/Notes/NotesProvider.js | 6 ++--
4 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/app/components/SimpleEditor/miniEditor/miniEditor.js b/app/components/SimpleEditor/miniEditor/miniEditor.js
index c2fbda2..04af978 100644
--- a/app/components/SimpleEditor/miniEditor/miniEditor.js
+++ b/app/components/SimpleEditor/miniEditor/miniEditor.js
@@ -32,10 +32,9 @@ class MiniEditor extends ProseEditor {
// TEMP
// const commentsPane = $$('ul').addClass('sc-comment-pane-list').addClass('sc-comments-pane').append('notes Editor Comments')
-
var commentsPane = $$(Comments, {
// TODO -- should probably remove the || {}
- // comments: this.props.fragment.comments || {},
+ comments: this.props.comments || {},
fragment: this.props.fragment,
update: this.props.update,
user: this.props.user
@@ -77,7 +76,10 @@ class MiniEditor extends ProseEditor {
return $$(ContainerEditor, {
editorSession: this.editorSession,
containerId: 'body',
- spellcheck: 'native'
+ spellcheck: 'native',
+ user: this.props.user,
+ comments: this.props.comments,
+ fragment: this.props.fragment
}).ref('mini_body')
}
diff --git a/app/components/SimpleEditor/panes/Comments/CommentBox.js b/app/components/SimpleEditor/panes/Comments/CommentBox.js
index 8e9fa86..f9ec67b 100644
--- a/app/components/SimpleEditor/panes/Comments/CommentBox.js
+++ b/app/components/SimpleEditor/panes/Comments/CommentBox.js
@@ -101,6 +101,7 @@ class CommentBox extends Component {
const comments = this.props.comments
const id = this.props.entry.id
const provider = this.getProvider()
+ console.log('this props', this.props)
const user = this.props.user.username
let textarea = this.refs.commentReply
diff --git a/app/components/SimpleEditor/panes/Notes/Notes.js b/app/components/SimpleEditor/panes/Notes/Notes.js
index 5ae4767..7a1a40e 100644
--- a/app/components/SimpleEditor/panes/Notes/Notes.js
+++ b/app/components/SimpleEditor/panes/Notes/Notes.js
@@ -41,8 +41,16 @@ class Notes extends Component {
const el = $$('div')
.addClass('notes-container').append(resizer)
+ const comments = this.getComments()
+ const fragment = this.getFragment()
+ const user = this.getUser()
+ const update = this.getUpdate()
el.append($$(MiniEditor, {
- editorSession: miniEditorSession
+ editorSession: miniEditorSession,
+ comments: comments,
+ fragment: fragment,
+ user: user,
+ update: update
}))
resizer.addEventListener('mousedown', this.initResize, false)
@@ -58,13 +66,13 @@ class Notes extends Component {
const provider = this.getProvider()
const notes = provider.computeEntries()
- let nontesContent = ''
+ let notesContent = ''
for (var i = 0; i < notes.length; i++) {
- nontesContent += notes[i].content
+ notesContent += notes[i].content
}
- const doc = importer.importDocument(nontesContent)
+ const doc = importer.importDocument(notesContent)
const editorSession = new EditorSession(doc, {
configurator: configurator
@@ -77,6 +85,22 @@ class Notes extends Component {
return this.context.notesProvider
}
+ getComments () {
+ return this.context.commentsProvider.config.comments
+ }
+
+ getUser () {
+ return this.context.editor.props.user
+ }
+
+ getFragment () {
+ return this.context.editor.props.fragment
+ }
+
+ getUpdate () {
+ return this.context.editor.props.update
+ }
+
onNotesUpdated (change) {
const notesProvider = this.getProvider()
notesProvider.handleDocumentChange(change)
diff --git a/app/components/SimpleEditor/panes/Notes/NotesProvider.js b/app/components/SimpleEditor/panes/Notes/NotesProvider.js
index 10df666..d489a13 100644
--- a/app/components/SimpleEditor/panes/Notes/NotesProvider.js
+++ b/app/components/SimpleEditor/panes/Notes/NotesProvider.js
@@ -10,7 +10,7 @@ class NotesProvider extends TOCProvider {
const docMini = this.config.miniEditorSession.document
let nodesMini = ''
if (docMini) nodesMini = docMini.getNodes()
- if(docMini)console.log('paragraphs', nodesMini)
+ // if(docMini)console.log('paragraphs', nodesMini)
// get all notes from the document
const notesMain = _.pickBy(nodesMain, function (value, key) {
return value.type === 'note'
@@ -21,7 +21,7 @@ class NotesProvider extends TOCProvider {
const entries = this.sortNodes(notesMain)
const entriesMini = this.sortNodesMini(notesMini)
- console.log(entries, entriesMini)
+ // console.log(entries, entriesMini)
return entries
}
@@ -58,7 +58,7 @@ class NotesProvider extends TOCProvider {
const doc = this.config.miniEditorSession.document
const container = doc.get('body')
- console.log(notes)
+ // console.log(notes)
notes = _.map(notes, function (note) {
// const blockId = note.path[0]
// const blockPosition = container.getPosition(blockId)
--
GitLab