From 09d14c994f07e417c6e5a23922c2292edc34399e Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Sun, 16 Apr 2017 23:34:32 +0300
Subject: [PATCH] fixes for deleting a callout and a note content
---
app/components/SimpleEditor/ContainerEditor.js | 4 ++--
.../SimpleEditor/elements/note/NoteComponent.js | 1 -
.../SimpleEditor/panes/Notes/NotesProvider.js | 17 ++++++++++-------
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/app/components/SimpleEditor/ContainerEditor.js b/app/components/SimpleEditor/ContainerEditor.js
index 938ba96..db78b1f 100644
--- a/app/components/SimpleEditor/ContainerEditor.js
+++ b/app/components/SimpleEditor/ContainerEditor.js
@@ -34,8 +34,8 @@ class ContainerEditor extends SubstanceContainerEditor {
didMount () {
super.didMount()
- const containerId = this.getContainerId()
- if (this.isEmpty() && containerId !== 'mini') this.createText()
+
+ if (this.isEmpty()) this.createText()
// TODO -- why this and not this.focus ?
this.el.focus()
diff --git a/app/components/SimpleEditor/elements/note/NoteComponent.js b/app/components/SimpleEditor/elements/note/NoteComponent.js
index 5d549d0..cd061b4 100644
--- a/app/components/SimpleEditor/elements/note/NoteComponent.js
+++ b/app/components/SimpleEditor/elements/note/NoteComponent.js
@@ -41,7 +41,6 @@ class NoteComponent extends Component {
const session = this.context.editorSession
const sel = session.getSelection()
- console.log('selsel', sel)
const notes = documentHelpers.getPropertyAnnotationsForSelection(
session.getDocument(),
diff --git a/app/components/SimpleEditor/panes/Notes/NotesProvider.js b/app/components/SimpleEditor/panes/Notes/NotesProvider.js
index bfedf07..877a5d0 100644
--- a/app/components/SimpleEditor/panes/Notes/NotesProvider.js
+++ b/app/components/SimpleEditor/panes/Notes/NotesProvider.js
@@ -33,6 +33,7 @@ class NotesProvider extends TOCProvider {
if (entriesMini && entriesMain.length < entriesMini.length) {
this.findDeletedNote(entries)
}
+
return entries
}
@@ -102,7 +103,7 @@ class NotesProvider extends TOCProvider {
const containerId = this.getMiniContainerId()
let surface = this.config.miniEditorContext.surfaceManager.getSurface(containerId)
- if (notes.mini && notes.mini.length > 0) {
+ if (notes.mini) {
let container = surface.getContainer()
let findIndex = _.findIndex(notes.main, ['id', note.id])
@@ -114,13 +115,15 @@ class NotesProvider extends TOCProvider {
tx.update(container.getContentPath(), { type: 'insert', pos: findIndex, value: blockNode.id })
}
})
- } else {
- surface.createText()
- this.config.miniEditorSession.transaction(function (tx) {
- let nodeData = this.createNodeData(note)
- tx.insertBlockNode(nodeData)
- }.bind(this))
}
+
+ // else {
+ // surface.createText()
+ // this.config.miniEditorSession.transaction(function (tx) {
+ // let nodeData = this.createNodeData(note)
+ // tx.insertBlockNode(nodeData)
+ // }.bind(this))
+ // }
}
findDeletedNote (entries) {
--
GitLab