Skip to content
Snippets Groups Projects
Commit 1a540849 authored by chris's avatar chris Committed by john
Browse files

bug fixing for syncing both editors computing nodes

parent ce1061cf
No related branches found
No related tags found
No related merge requests found
...@@ -2,7 +2,6 @@ import { ...@@ -2,7 +2,6 @@ import {
BasePackage, BasePackage,
EmphasisPackage, EmphasisPackage,
ParagraphPackage, ParagraphPackage,
PersistencePackage,
ProseArticle, ProseArticle,
StrongPackage, StrongPackage,
SpellCheckPackage SpellCheckPackage
...@@ -26,7 +25,6 @@ let config = { ...@@ -26,7 +25,6 @@ let config = {
config.import(ParagraphPackage) config.import(ParagraphPackage)
config.import(EmphasisPackage) config.import(EmphasisPackage)
config.import(StrongPackage) config.import(StrongPackage)
config.import(PersistencePackage)
config.import(SpellCheckPackage) config.import(SpellCheckPackage)
config.import(CommentPackage) config.import(CommentPackage)
} }
......
...@@ -3,7 +3,7 @@ import { Component, EditorSession, ...@@ -3,7 +3,7 @@ import { Component, EditorSession,
import MiniEditor from '../../miniEditor/miniEditor' import MiniEditor from '../../miniEditor/miniEditor'
import config from '../../miniEditor/config' import config from '../../miniEditor/config'
import Importer from '../../SimpleEditorImporter' import Importer from '../../SimpleEditorImporter'
import SimpleExporter from '../../SimpleEditorExporter' // import SimpleExporter from '../../SimpleEditorExporter'
class Notes extends Component { class Notes extends Component {
constructor (props) { constructor (props) {
...@@ -55,16 +55,21 @@ class Notes extends Component { ...@@ -55,16 +55,21 @@ class Notes extends Component {
configurator.addImporter('html', Importer) configurator.addImporter('html', Importer)
const importer = configurator.createImporter('html') 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, { const editorSession = new EditorSession(doc, {
configurator: configurator configurator: configurator
}) })
editorSession.setSaveHandler({
saveDocument: this.saveNote
})
return editorSession return editorSession
} }
...@@ -75,8 +80,7 @@ class Notes extends Component { ...@@ -75,8 +80,7 @@ class Notes extends Component {
onNotesUpdated (change) { onNotesUpdated (change) {
const notesProvider = this.getProvider() const notesProvider = this.getProvider()
notesProvider.handleDocumentChange(change) notesProvider.handleDocumentChange(change)
this.context.notesProvider.config.miniEditorSession = this._initMiniEditor() // this.el.el.style.height = '95px'
this.rerender()
} }
dispose () { dispose () {
......
...@@ -16,7 +16,7 @@ class NotesProvider extends TOCProvider { ...@@ -16,7 +16,7 @@ class NotesProvider extends TOCProvider {
}) })
const notesMini = _.pickBy(nodesMini, function (value, key) { const notesMini = _.pickBy(nodesMini, function (value, key) {
return value.type === 'note' return value.type === 'strong'
}) })
const entries = this.sortNodes(notesMain) const entries = this.sortNodes(notesMain)
...@@ -56,7 +56,7 @@ class NotesProvider extends TOCProvider { ...@@ -56,7 +56,7 @@ class NotesProvider extends TOCProvider {
if (this.config.miniEditorSession === '') return if (this.config.miniEditorSession === '') return
const doc = this.config.miniEditorSession.document const doc = this.config.miniEditorSession.document
const container = doc.get('mini') const container = doc.get('body')
notes = _.map(notes, function (note) { notes = _.map(notes, function (note) {
const blockId = note.path[0] const blockId = note.path[0]
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment