From b32ea32e4f881ab6688d82c83405ca8a1d013f09 Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Sun, 23 Apr 2017 15:19:28 +0300
Subject: [PATCH] rename miniEditor to notesEditor
---
.../SimpleEditor/ContainerEditor.js | 2 +-
app/components/SimpleEditor/Editor.js | 2 +-
.../elements/comment/CommentBubble.js | 2 +-
.../miniEditor/MiniEditorImporter.js | 2 +-
.../SimpleEditor/miniEditor/miniEditor.js | 26 +++++-----
.../SimpleEditor/miniEditor/miniEditor.scss | 2 +-
.../panes/Comments/CommentsProvider.js | 18 +++----
.../SimpleEditor/panes/Notes/Notes.js | 50 +++++++++----------
.../SimpleEditor/panes/Notes/NotesProvider.js | 2 +-
9 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/app/components/SimpleEditor/ContainerEditor.js b/app/components/SimpleEditor/ContainerEditor.js
index d195af8..1f80b3a 100644
--- a/app/components/SimpleEditor/ContainerEditor.js
+++ b/app/components/SimpleEditor/ContainerEditor.js
@@ -35,7 +35,7 @@ class ContainerEditor extends SubstanceContainerEditor {
didMount () {
super.didMount()
- if (this.isEmpty() && this.props.containerId !== 'mini') this.createText()
+ if (this.isEmpty() && this.props.containerId !== 'notes') this.createText()
// TODO -- why this and not this.focus ?
this.el.focus()
diff --git a/app/components/SimpleEditor/Editor.js b/app/components/SimpleEditor/Editor.js
index f608817..5767139 100644
--- a/app/components/SimpleEditor/Editor.js
+++ b/app/components/SimpleEditor/Editor.js
@@ -243,7 +243,7 @@ class Editor extends ProseEditor {
// notes provider
const notesProvider = new NotesProvider(doc, {
- miniEditorContext: ''
+ notesEditorContext: ''
})
// comments provider
diff --git a/app/components/SimpleEditor/elements/comment/CommentBubble.js b/app/components/SimpleEditor/elements/comment/CommentBubble.js
index 7ea6d30..d741328 100644
--- a/app/components/SimpleEditor/elements/comment/CommentBubble.js
+++ b/app/components/SimpleEditor/elements/comment/CommentBubble.js
@@ -56,7 +56,7 @@ class CommentBubble extends Tool {
let overlayContainer = document.querySelector('.sc-overlay')
let fix = 15
if (parseInt(overlayContainer.offsetLeft) === 0) {
- const minEditorContentPanelChildren = document.getElementById('mini-editor-content-panel').children
+ const minEditorContentPanelChildren = document.getElementById('notes-editor-content-panel').children
const temp = minEditorContentPanelChildren[0].children
documentElement = temp[0]
const children = temp[0].children
diff --git a/app/components/SimpleEditor/miniEditor/MiniEditorImporter.js b/app/components/SimpleEditor/miniEditor/MiniEditorImporter.js
index 8770c6f..ec7153b 100644
--- a/app/components/SimpleEditor/miniEditor/MiniEditorImporter.js
+++ b/app/components/SimpleEditor/miniEditor/MiniEditorImporter.js
@@ -13,7 +13,7 @@ class SimpleImporter extends HTMLImporter {
convertDocument (bodyEls) {
if (!bodyEls.length) bodyEls = [bodyEls]
- this.convertContainer(bodyEls, 'mini')
+ this.convertContainer(bodyEls, 'notes')
}
// TODO -- check substance's implementation of overlapping annotations
diff --git a/app/components/SimpleEditor/miniEditor/miniEditor.js b/app/components/SimpleEditor/miniEditor/miniEditor.js
index 6011dc0..b61c640 100644
--- a/app/components/SimpleEditor/miniEditor/miniEditor.js
+++ b/app/components/SimpleEditor/miniEditor/miniEditor.js
@@ -10,11 +10,11 @@ import TrackChangesProvider from '../elements/track_change/TrackChangesProvider'
import SimpleExporter from '../SimpleEditorExporter'
import _ from 'lodash'
-class MiniEditor extends ProseEditor {
+class NotesEditor extends ProseEditor {
didMount () {
const provider = this.getProvider()
- provider.config.miniEditorContext = this.getChildContext()
+ provider.config.notesEditorContext = this.getChildContext()
this.editorSession.onUpdate('document', this.findNote, this)
this.on('noteSelected', this.scrollTo, this)
this.on('notes:inserted', this.createNote, this)
@@ -22,8 +22,8 @@ class MiniEditor extends ProseEditor {
}
render ($$) {
- const el = $$('div').addClass('sc-mini-editor')
- let toolbar = this._renderMiniToolbar($$)
+ const el = $$('div').addClass('sc-notes-editor')
+ let toolbar = this._renderNotesToolbar($$)
let editor = this._renderEditor($$)
let SplitPane = this.componentRegistry.get('split-pane')
let ScrollPane = this.componentRegistry.get('scroll-pane')
@@ -43,12 +43,12 @@ class MiniEditor extends ProseEditor {
)
const contentPanel = $$(ScrollPane, {
- name: 'miniEditorContentPanel',
+ name: 'notesEditorContentPanel',
scrollbarPosition: 'right'
})
.append(editorWithComments, $$(Overlay))
- .attr('id', 'mini-editor-content-panel')
- .ref('miniEditorContentPanel')
+ .attr('id', 'notes-editor-content-panel')
+ .ref('notesEditorContentPanel')
el.append(
$$(SplitPane, { splitType: 'horizontal' })
@@ -58,13 +58,13 @@ class MiniEditor extends ProseEditor {
return el
}
- _renderMiniToolbar ($$) {
+ _renderNotesToolbar ($$) {
let commandStates = this.commandManager.getCommandStates()
return $$('div').addClass('se-toolbar-wrapper').append(
$$(Toolbar, {
commandStates: commandStates,
toolGroups: ['annotations']
- }).ref('mini_toolbar')
+ }).ref('notes_toolbar')
)
}
@@ -81,7 +81,7 @@ class MiniEditor extends ProseEditor {
spellcheck: 'native',
trackChanges: this.props.trackChanges,
user: this.props.user
- }).ref('mini_body')
+ }).ref('notes_body')
}
scrollTo (nodeId) {
@@ -90,7 +90,7 @@ class MiniEditor extends ProseEditor {
return c.parentNoteId === nodeId
})
- this.refs.miniEditorContentPanel.scrollTo(note.id)
+ this.refs.notesEditorContentPanel.scrollTo(note.id)
}
createNodeData (note) {
@@ -212,7 +212,7 @@ class MiniEditor extends ProseEditor {
getSurface () {
const containerId = this.props.containerId
const provider = this.getProvider()
- return provider.config.miniEditorContext.surfaceManager.getSurface(containerId)
+ return provider.config.notesEditorContext.surfaceManager.getSurface(containerId)
}
getChildContext () {
@@ -249,4 +249,4 @@ class MiniEditor extends ProseEditor {
}
}
-export default MiniEditor
+export default NotesEditor
diff --git a/app/components/SimpleEditor/miniEditor/miniEditor.scss b/app/components/SimpleEditor/miniEditor/miniEditor.scss
index 43a9dec..41c4ce5 100644
--- a/app/components/SimpleEditor/miniEditor/miniEditor.scss
+++ b/app/components/SimpleEditor/miniEditor/miniEditor.scss
@@ -2,7 +2,7 @@ $red: #ff0000;
$background: #fff;
.notes-container {
- .sc-mini-editor {
+ .sc-notes-editor {
margin-top: 6px;
.se-toolbar-wrapper {
diff --git a/app/components/SimpleEditor/panes/Comments/CommentsProvider.js b/app/components/SimpleEditor/panes/Comments/CommentsProvider.js
index 3407c83..fe1e3f8 100644
--- a/app/components/SimpleEditor/panes/Comments/CommentsProvider.js
+++ b/app/components/SimpleEditor/panes/Comments/CommentsProvider.js
@@ -282,12 +282,12 @@ class CommentsProvider extends TocProvider {
return surfaceManager.getSurface(containerId)
}
- getMiniDocument () {
+ getNotesDocument () {
const notesProvider = this.config.controller.context.notesProvider
- const miniEditorContext = notesProvider.config.miniEditorContext
- if (!miniEditorContext) return
+ const notesEditorContext = notesProvider.config.notesEditorContext
+ if (!notesEditorContext) return
- return miniEditorContext.editorSession.document
+ return notesEditorContext.editorSession.document
}
isSelectionLargerThanComments () {
@@ -385,13 +385,13 @@ class CommentsProvider extends TocProvider {
var doc = this.getDocument()
var container = doc.get('body')
- let docMini = ''
- let containerMini = ''
+ let docNotes = ''
+ let containerNotes = ''
if (this.config.controller.context.notesProvider) {
- docMini = this.getMiniDocument()
+ docNotes = this.getNotesDocument()
}
- if (docMini) containerMini = docMini.get('mini')
+ if (docNotes) containerNotes = docNotes.get('notes')
// sort notes by
// the index of the containing block
@@ -399,7 +399,7 @@ class CommentsProvider extends TocProvider {
comments = _.map(comments, function (comment) {
const blockId = comment.path[0]
let blockPosition = container.getPosition(blockId)
- if (blockPosition === -1 && containerMini) blockPosition = containerMini.getPosition(blockId)
+ if (blockPosition === -1 && containerNotes) blockPosition = containerNotes.getPosition(blockId)
const nodePosition = comment.start.offset
diff --git a/app/components/SimpleEditor/panes/Notes/Notes.js b/app/components/SimpleEditor/panes/Notes/Notes.js
index 867c991..0f2d261 100644
--- a/app/components/SimpleEditor/panes/Notes/Notes.js
+++ b/app/components/SimpleEditor/panes/Notes/Notes.js
@@ -1,6 +1,6 @@
import { Component, EditorSession,
ProseEditorConfigurator as Configurator } from 'substance'
-import MiniEditor from '../../miniEditor/miniEditor'
+import NotesEditor from '../../miniEditor/miniEditor'
import config from '../../miniEditor/config'
import Importer from '../../miniEditor/MiniEditorImporter'
import {isEmpty, find} from 'lodash'
@@ -18,26 +18,26 @@ class Notes extends Component {
}
render ($$) {
- const miniSessionConf = this._initMiniEditor()
+ const notesSessionConf = this._initNotesEditor()
const resizer = $$('div').addClass('resize-area')
const el = $$('div')
.addClass('notes-container').append(resizer)
- const miniEditorProps = this.getParentProps()
-
- el.append($$(MiniEditor, {
- book: miniEditorProps.book,
- editorSession: miniSessionConf.editorSession,
- comments: miniEditorProps.comments,
- configurator: miniSessionConf.configurator,
- containerId: 'mini',
- history: miniEditorProps.history,
- disabled: miniEditorProps.disabled,
- fragment: miniEditorProps.fragment,
- trackChanges: miniEditorProps.trackChanges,
- update: miniEditorProps.update,
- user: miniEditorProps.user
+ const notesEditorProps = this.getParentProps()
+
+ el.append($$(NotesEditor, {
+ book: notesEditorProps.book,
+ editorSession: notesSessionConf.editorSession,
+ comments: notesEditorProps.comments,
+ configurator: notesSessionConf.configurator,
+ containerId: 'notes',
+ history: notesEditorProps.history,
+ disabled: notesEditorProps.disabled,
+ fragment: notesEditorProps.fragment,
+ trackChanges: notesEditorProps.trackChanges,
+ update: notesEditorProps.update,
+ user: notesEditorProps.user
}))
resizer.addEventListener('mousedown', this.initResize, false)
@@ -45,7 +45,7 @@ class Notes extends Component {
return el
}
- _initMiniEditor () {
+ _initNotesEditor () {
const configurator = new Configurator().import(config)
configurator.addImporter('html', Importer)
const importer = configurator.createImporter('html')
@@ -78,7 +78,7 @@ class Notes extends Component {
resize (e) {
const height = (this.el.el.offsetHeight + this.el.el.offsetTop - e.clientY)
- const scrollPane = document.getElementById('mini-editor-content-panel').children
+ const scrollPane = document.getElementById('notes-editor-content-panel').children
scrollPane[0].style.minHeight = height - 40 + 'px'
const mainScrollPane = document.getElementById('content-panel').children
mainScrollPane[0].style.maxHeight = this.el.el.offsetTop - 140 + 'px'
@@ -93,7 +93,7 @@ class Notes extends Component {
onNotesUpdated (change) {
const notesProvider = this.getProvider()
notesProvider.handleDocumentChange(change)
- const miniEditor = this.getMiniEditor()
+ const notesEditor = this.getNotesEditor()
const NoteCreated = find(change.created, function (value, key) {
return value.type === 'note'
@@ -104,12 +104,12 @@ class Notes extends Component {
})
if (!isEmpty(NoteCreated)) {
- miniEditor.emit('notes:inserted', NoteCreated.id)
+ notesEditor.emit('notes:inserted', NoteCreated.id)
return false
}
if (!isEmpty(NoteDeleted)) {
- miniEditor.emit('notes:deleted', NoteDeleted.id)
+ notesEditor.emit('notes:deleted', NoteDeleted.id)
return false
}
}
@@ -134,17 +134,17 @@ class Notes extends Component {
getSurface () {
const provider = this.getProvider()
const containerId = this.getContainerId()
- return provider.config.miniEditorContext.surfaceManager.getSurface(containerId)
+ return provider.config.notesEditorContext.surfaceManager.getSurface(containerId)
}
- getMiniEditor () {
+ getNotesEditor () {
const provider = this.getProvider()
- return provider.config.miniEditorContext.editor
+ return provider.config.notesEditorContext.editor
}
getContainerId () {
const provider = this.getProvider()
- return provider.config.miniEditorContext.editor.props.containerId
+ return provider.config.notesEditorContext.editor.props.containerId
}
dispose () {
diff --git a/app/components/SimpleEditor/panes/Notes/NotesProvider.js b/app/components/SimpleEditor/panes/Notes/NotesProvider.js
index 44c655a..d2c12d0 100644
--- a/app/components/SimpleEditor/panes/Notes/NotesProvider.js
+++ b/app/components/SimpleEditor/panes/Notes/NotesProvider.js
@@ -45,7 +45,7 @@ class NotesProvider extends TOCProvider {
}
showNote (note) {
- this.config.miniEditorContext.editor.emit('noteSelected', note.id)
+ this.config.notesEditorContext.editor.emit('noteSelected', note.id)
}
}
--
GitLab