From 57ce7d6f42c313c4e7a8dbf77ac078fa5a6acd06 Mon Sep 17 00:00:00 2001
From: john <johnbarlas39@gmail.com>
Date: Sun, 19 Mar 2017 18:31:23 +0200
Subject: [PATCH] fix rebase errors
---
app/components/SimpleEditor/Editor.js | 13 +++++++------
app/components/SimpleEditor/config.js | 4 ++++
.../SimpleEditor/panes/Comments/CommentsProvider.js | 1 -
.../panes/TableOfContents/TableOfContents.js | 3 +--
4 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/app/components/SimpleEditor/Editor.js b/app/components/SimpleEditor/Editor.js
index 5386b76..4633a5d 100644
--- a/app/components/SimpleEditor/Editor.js
+++ b/app/components/SimpleEditor/Editor.js
@@ -73,7 +73,7 @@ class Editor extends ProseEditor {
// TODO -- unnecessary // posssibly breaks book builder dnd
let ContextMenu = this.componentRegistry.get('context-menu') // new what does it do?
- let Dropzones = this.componentRegistry.get('dropzones') // new what does it do?
+ // let Dropzones = this.componentRegistry.get('dropzones') // new what does it do?
const footerNotes = $$(Notes)
@@ -114,12 +114,13 @@ class Editor extends ProseEditor {
})
.append(editorWithComments,
$$(Overlay),
- $$(ContextMenu),
- $$(Dropzones))
+ $$(ContextMenu)
+ // $$(Dropzones)
+ )
.attr('id', 'content-panel')
.ref('contentPanel')
- var contentPanelWithSplitPane = $$(SplitPane, { sizeA: '75%', splitType: 'vertical' })
+ const contentPanelWithSplitPane = $$(SplitPane, { sizeA: '75%', splitType: 'vertical' })
.append(
contentPanel,
toc
@@ -166,10 +167,10 @@ class Editor extends ProseEditor {
trackChanges: this.props.trackChanges,
trackChangesView: this.state.trackChangesView,
toolGroups: [
+ 'text',
+ 'document',
'annotations',
'default',
- 'document',
- 'text',
'track-change-enable',
'track-change-toggle-view'
]
diff --git a/app/components/SimpleEditor/config.js b/app/components/SimpleEditor/config.js
index a45aa93..35d73bf 100644
--- a/app/components/SimpleEditor/config.js
+++ b/app/components/SimpleEditor/config.js
@@ -1,5 +1,6 @@
import {
BasePackage,
+ // Blockquote,
CodePackage,
EmphasisPackage,
HeadingPackage,
@@ -36,6 +37,7 @@ let config = {
config.import(BasePackage, {
noBaseStyles: options.noBaseStyles
})
+
config.import(SwitchTextTypePackage)
config.import(ParagraphPackage)
config.import(HeadingPackage)
@@ -46,6 +48,8 @@ let config = {
config.import(CodePackage)
config.import(PersistencePackage)
+ // console.log(Blockquote)
+
// config.import(CodeblockPackage)
config.import(CommentPackage)
config.import(ExtractPackage)
diff --git a/app/components/SimpleEditor/panes/Comments/CommentsProvider.js b/app/components/SimpleEditor/panes/Comments/CommentsProvider.js
index e013645..ebf2403 100644
--- a/app/components/SimpleEditor/panes/Comments/CommentsProvider.js
+++ b/app/components/SimpleEditor/panes/Comments/CommentsProvider.js
@@ -67,7 +67,6 @@ class CommentsProvider extends TocProvider {
// runs when document session is updated
updateActiveEntry () {
- console.log('updateActiveEntry')
const activeEntry = this.getActiveEntry()
const selectionContainsComments = this.selectionContainsComments()
diff --git a/app/components/SimpleEditor/panes/TableOfContents/TableOfContents.js b/app/components/SimpleEditor/panes/TableOfContents/TableOfContents.js
index 218354b..f60ffc5 100644
--- a/app/components/SimpleEditor/panes/TableOfContents/TableOfContents.js
+++ b/app/components/SimpleEditor/panes/TableOfContents/TableOfContents.js
@@ -29,8 +29,7 @@ class TableOfContents extends Toc {
}
render ($$) {
- const provider = this.getProvider()
- const { book, fragment } = provider.config.props
+ const { book, fragment } = this.props
const tocProvider = this.getProvider()
const activeEntry = tocProvider.activeEntry
--
GitLab