From ea19a557ec04511a1e0986c726852e98728f6ed7 Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Fri, 7 Apr 2017 13:20:21 +0300
Subject: [PATCH] note tool not needed on click of not callout send to provider
---
.../elements/note/EditNoteTool.js | 2 +-
.../elements/note/NoteComponent.js | 12 ++++-
.../SimpleEditor/elements/note/NotePackage.js | 2 -
.../SimpleEditor/elements/note/note.scss | 45 -------------------
.../SimpleEditor/panes/Notes/NotesProvider.js | 4 ++
5 files changed, 15 insertions(+), 50 deletions(-)
diff --git a/app/components/SimpleEditor/elements/note/EditNoteTool.js b/app/components/SimpleEditor/elements/note/EditNoteTool.js
index 4e8150e..4ace047 100644
--- a/app/components/SimpleEditor/elements/note/EditNoteTool.js
+++ b/app/components/SimpleEditor/elements/note/EditNoteTool.js
@@ -13,7 +13,7 @@ class EditNoteTool extends Tool {
let el = $$('div').addClass('sc-edit-note-tool')
if (!selected.node) return el
-
+
provider.config.miniEditorContext.editor.emit('noteSelected', 'paragraph-71bf75436a5f9b56700064c6ee2116ab')
return el
}
diff --git a/app/components/SimpleEditor/elements/note/NoteComponent.js b/app/components/SimpleEditor/elements/note/NoteComponent.js
index a5c9825..b21d373 100644
--- a/app/components/SimpleEditor/elements/note/NoteComponent.js
+++ b/app/components/SimpleEditor/elements/note/NoteComponent.js
@@ -6,12 +6,20 @@ class NoteComponent extends Component {
render ($$) {
const el = $$('note')
.attr('note-content', this.props.node['note-content'])
- .addClass('sc-note')
- // .append('a')
+ .addClass('sc-note').on('click', this.createShowNote)
return el
}
+ createShowNote () {
+ const provider = this.getProvider()
+ provider.createShowNote()
+ }
+
+ getProvider () {
+ return this.context.notesProvider
+ }
+
dispose () {
this.props.node.off(this)
}
diff --git a/app/components/SimpleEditor/elements/note/NotePackage.js b/app/components/SimpleEditor/elements/note/NotePackage.js
index 53ac142..e53cb99 100644
--- a/app/components/SimpleEditor/elements/note/NotePackage.js
+++ b/app/components/SimpleEditor/elements/note/NotePackage.js
@@ -1,4 +1,3 @@
-import EditNoteTool from './EditNoteTool'
import Note from './Note'
import NoteCommand from './NoteCommand'
import NoteComponent from './NoteComponent'
@@ -14,7 +13,6 @@ export default {
config.addConverter('html', NoteHTMLConverter)
config.addCommand(Note.type, NoteCommand, { nodeType: Note.type })
config.addTool('note', NoteTool, { toolGroup: 'annotations' })
- config.addTool('note', EditNoteTool, { toolGroup: 'overlay' })
config.addIcon('note', { 'fontawesome': 'fa-bookmark' })
config.addLabel('note', {
en: 'Note'
diff --git a/app/components/SimpleEditor/elements/note/note.scss b/app/components/SimpleEditor/elements/note/note.scss
index 5e54d1c..dbf475f 100644
--- a/app/components/SimpleEditor/elements/note/note.scss
+++ b/app/components/SimpleEditor/elements/note/note.scss
@@ -23,48 +23,3 @@ $red: #591818;
font-weight: 400;
}
}
-
-.sc-edit-note-tool-container {
- background-color: $gray;
- border: 1px solid $red;
- display: inline-block;
-
- .sc-save-area {
- display: inline;
- float: left;
- height: 100%;
- padding: 5px 5px 0;
- width: 40px;
-
- .sc-save-icon {
- color: $red;
- cursor: pointer;
- position: absolute;
- right: 19px;
- top: 17px;
-
- &:hover {
- color: $red;
- }
- }
- }
-
- textarea {
- background-color: $gray;
- border: transparent;
- border-right: 1px dashed $red;
- color: $red;
- float: left;
- font-family: 'Fira Sans';
- font-size: 15px;
- min-height: 39px;
- outline: none;
- overflow: hidden;
- resize: none;
- width: 310px;
-
- &[disabled] {
- border-right: 0;
- }
- }
-}
diff --git a/app/components/SimpleEditor/panes/Notes/NotesProvider.js b/app/components/SimpleEditor/panes/Notes/NotesProvider.js
index ced57c1..557d16f 100644
--- a/app/components/SimpleEditor/panes/Notes/NotesProvider.js
+++ b/app/components/SimpleEditor/panes/Notes/NotesProvider.js
@@ -75,6 +75,10 @@ class NotesProvider extends TOCProvider {
return notes
// return _.sortBy(notes, ['blockPosition', 'nodePosition'])
}
+
+ createShowNote () {
+ console.log('in provider')
+ }
}
NotesProvider.tocTypes = ['note']
--
GitLab