From 88bb685e8ac2be20e708e70fb6edf7716586ca3b Mon Sep 17 00:00:00 2001 From: chris <kokosias@yahoo.gr> Date: Tue, 11 Apr 2017 16:34:16 +0300 Subject: [PATCH] isolated node created for first note and saved --- .../SimpleEditor/panes/Notes/Notes.js | 28 ++++++------------- .../SimpleEditor/panes/Notes/NotesProvider.js | 20 ++----------- 2 files changed, 12 insertions(+), 36 deletions(-) diff --git a/app/components/SimpleEditor/panes/Notes/Notes.js b/app/components/SimpleEditor/panes/Notes/Notes.js index 631592b..de47b97 100644 --- a/app/components/SimpleEditor/panes/Notes/Notes.js +++ b/app/components/SimpleEditor/panes/Notes/Notes.js @@ -17,6 +17,13 @@ class Notes extends Component { // use toc:updated to avoid rewriting TOCProvider's this.handleDocumentChange didMount () { this.context.editorSession.onUpdate('document', this.onNotesUpdated, this) + const provider = this.getProvider() + + const notes = provider.computeEntries() + + for (var i = 0; i < notes.main.length; i++) { + provider.createIsolatedNote(notes.main[i]) + } } initResize (e) { @@ -63,23 +70,10 @@ class Notes extends Component { _initMiniEditor (tx) { const configurator = new Configurator().import(config) configurator.addImporter('html', Importer) - console.log('tx', tx) - const importer = configurator.createImporter('html') - const provider = this.getProvider() - - const notes = provider.computeEntries() - - let nontesContent = '' - if (this.context.notesProvider.config.miniEditorSession !== '') { - for (var i = 0; i < notes.main.length; i++) { - console.log('old', provider) - console.log('createIsolated', provider.createIsolatedNote(notes.main[i])) - nontesContent += provider.createIsolatedNote(notes.main[i]) - } - } + const importer = configurator.createImporter('html') - const doc = importer.importDocument(notesContent) + const doc = importer.importDocument('') const editorSession = new EditorSession(doc, { configurator: configurator @@ -95,8 +89,6 @@ class Notes extends Component { const notes = provider.computeEntries() let self = this - console.log('notes', notes) - forEach(notes.main, function (mainNote) { forEach(notes.mini, function (miniNote) { if (miniNote.parentNoteId === mainNote.id) { @@ -107,8 +99,6 @@ class Notes extends Component { } }) }) - // this.context.editor.rerender() - console.log('notes after', notes) return new Promise(function (resolve, reject) { resolve() }) diff --git a/app/components/SimpleEditor/panes/Notes/NotesProvider.js b/app/components/SimpleEditor/panes/Notes/NotesProvider.js index b0aeb42..95edf72 100644 --- a/app/components/SimpleEditor/panes/Notes/NotesProvider.js +++ b/app/components/SimpleEditor/panes/Notes/NotesProvider.js @@ -23,7 +23,7 @@ class NotesProvider extends TOCProvider { const entriesMain = this.sortNodes(notesMain) const entriesMini = this.sortNodesMini(notesMini) - console.log(entriesMain, entriesMini) + // console.log(entriesMain, entriesMini) const entries = { main: entriesMain, mini: entriesMini @@ -61,10 +61,7 @@ class NotesProvider extends TOCProvider { let notes = _.clone(nodes) if (this.config.miniEditorSession === '') return - const doc = this.config.miniEditorSession.document - const container = doc.get('body') - - // console.log(notes) + // const doc = this.config.miniEditorSession.document notes = _.map(notes, function (note) { // const blockId = note.path[0] // const blockPosition = container.getPosition(blockId) @@ -84,8 +81,6 @@ class NotesProvider extends TOCProvider { } createShowNote (note) { - console.log('in provider', note) - console.log('this', this) if (note['note-content'] !== '') { console.log('empty') @@ -106,18 +101,9 @@ class NotesProvider extends TOCProvider { createIsolatedNote (note) { let self = this - let node = {} - console.log('this', this) this.config.miniEditorSession.transaction(function (tx) { - var container = tx.get('body') - // console.log('container', container) - // var textType = tx.getSchema().getDefaultTextType() - // console.log('tx', tx) - let nodeData = self.createNodeData(tx, note) - // console.log('nodeData', nodeData) - node = tx.insertBlockNode(nodeData) - console.log('node', node) + tx.insertBlockNode(nodeData) }) } -- GitLab