From 1a5408494fe98bc2d4c9523d4e5d9069f50acd05 Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Wed, 5 Apr 2017 23:02:35 +0300
Subject: [PATCH] bug fixing for syncing both editors computing nodes
---
.../SimpleEditor/miniEditor/config.js | 2 --
.../SimpleEditor/panes/Notes/Notes.js | 20 +++++++++++--------
.../SimpleEditor/panes/Notes/NotesProvider.js | 4 ++--
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/app/components/SimpleEditor/miniEditor/config.js b/app/components/SimpleEditor/miniEditor/config.js
index af34a4a..0734a9e 100644
--- a/app/components/SimpleEditor/miniEditor/config.js
+++ b/app/components/SimpleEditor/miniEditor/config.js
@@ -2,7 +2,6 @@ import {
BasePackage,
EmphasisPackage,
ParagraphPackage,
- PersistencePackage,
ProseArticle,
StrongPackage,
SpellCheckPackage
@@ -26,7 +25,6 @@ let config = {
config.import(ParagraphPackage)
config.import(EmphasisPackage)
config.import(StrongPackage)
- config.import(PersistencePackage)
config.import(SpellCheckPackage)
config.import(CommentPackage)
}
diff --git a/app/components/SimpleEditor/panes/Notes/Notes.js b/app/components/SimpleEditor/panes/Notes/Notes.js
index cc131e2..5ae4767 100644
--- a/app/components/SimpleEditor/panes/Notes/Notes.js
+++ b/app/components/SimpleEditor/panes/Notes/Notes.js
@@ -3,7 +3,7 @@ import { Component, EditorSession,
import MiniEditor from '../../miniEditor/miniEditor'
import config from '../../miniEditor/config'
import Importer from '../../SimpleEditorImporter'
-import SimpleExporter from '../../SimpleEditorExporter'
+// import SimpleExporter from '../../SimpleEditorExporter'
class Notes extends Component {
constructor (props) {
@@ -55,16 +55,21 @@ class Notes extends Component {
configurator.addImporter('html', Importer)
const importer = configurator.createImporter('html')
- const doc = importer.importDocument('')
+ const provider = this.getProvider()
+
+ const notes = provider.computeEntries()
+ let nontesContent = ''
+
+ for (var i = 0; i < notes.length; i++) {
+ nontesContent += notes[i].content
+ }
+
+ const doc = importer.importDocument(nontesContent)
const editorSession = new EditorSession(doc, {
configurator: configurator
})
- editorSession.setSaveHandler({
- saveDocument: this.saveNote
- })
-
return editorSession
}
@@ -75,8 +80,7 @@ class Notes extends Component {
onNotesUpdated (change) {
const notesProvider = this.getProvider()
notesProvider.handleDocumentChange(change)
- this.context.notesProvider.config.miniEditorSession = this._initMiniEditor()
- this.rerender()
+ // this.el.el.style.height = '95px'
}
dispose () {
diff --git a/app/components/SimpleEditor/panes/Notes/NotesProvider.js b/app/components/SimpleEditor/panes/Notes/NotesProvider.js
index 277e424..b167e6d 100644
--- a/app/components/SimpleEditor/panes/Notes/NotesProvider.js
+++ b/app/components/SimpleEditor/panes/Notes/NotesProvider.js
@@ -16,7 +16,7 @@ class NotesProvider extends TOCProvider {
})
const notesMini = _.pickBy(nodesMini, function (value, key) {
- return value.type === 'note'
+ return value.type === 'strong'
})
const entries = this.sortNodes(notesMain)
@@ -56,7 +56,7 @@ class NotesProvider extends TOCProvider {
if (this.config.miniEditorSession === '') return
const doc = this.config.miniEditorSession.document
- const container = doc.get('mini')
+ const container = doc.get('body')
notes = _.map(notes, function (note) {
const blockId = note.path[0]
--
GitLab