From e3b5b1f24b70b06a294ac69280cd3ba6009b4e0c Mon Sep 17 00:00:00 2001
From: Alexandros Georgantas <alexgeorg86@gmail.com>
Date: Wed, 22 Feb 2017 16:49:52 +0200
Subject: [PATCH] Toggle Changes View button fixed
---
app/components/SimpleEditor/Editor.js | 9 ++++++---
.../track_change/TrackChangeControlViewCommand.js | 2 +-
.../elements/track_change/TrackChangeControlViewTool.js | 9 +++------
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/app/components/SimpleEditor/Editor.js b/app/components/SimpleEditor/Editor.js
index 66c140b..043f64e 100644
--- a/app/components/SimpleEditor/Editor.js
+++ b/app/components/SimpleEditor/Editor.js
@@ -22,13 +22,15 @@ class Editor extends ProseEditor {
'showComments': function () { this.toggleCommentsArea(true) },
'hideComments': function () { this.toggleCommentsArea(false) },
'trackChangesUpdate': function () { this.updateTrackChange() },
- 'domSelectionRendered': function () { this.domSelectionRendered() }
+ 'trackChangesViewToggle': function () { this.trackChangesViewToggle() }
})
}
- domSelectionRendered () {
+ trackChangesViewToggle () {
// TODO what to handle here????
- // console.log('rendered')
+ this.extendState({
+ trackChangesView: !this.state.trackChangesView
+ })
}
updateTrackChange () {
@@ -149,6 +151,7 @@ class Editor extends ProseEditor {
$$(Toolbar, {
commandStates: commandStates,
trackChanges: this.props.trackChanges,
+ trackChangesView: this.state.trackChangesView,
toolGroups: ['text', 'document', 'annotations', 'default', 'track-change-enable', 'track-change-toggle-view']
}).ref('toolbar')
)
diff --git a/app/components/SimpleEditor/elements/track_change/TrackChangeControlViewCommand.js b/app/components/SimpleEditor/elements/track_change/TrackChangeControlViewCommand.js
index def9e7f..829964d 100644
--- a/app/components/SimpleEditor/elements/track_change/TrackChangeControlViewCommand.js
+++ b/app/components/SimpleEditor/elements/track_change/TrackChangeControlViewCommand.js
@@ -13,7 +13,7 @@ class TrackChangeControlViewCommand extends Command {
// TODO -- review
execute (params, context) {
const surface = context.surfaceManager.getSurface('body')
- surface.send('trackChangesViewUpdate')
+ surface.send('trackChangesViewToggle')
surface.rerender()
return true
}
diff --git a/app/components/SimpleEditor/elements/track_change/TrackChangeControlViewTool.js b/app/components/SimpleEditor/elements/track_change/TrackChangeControlViewTool.js
index 59b8ca3..a9a01c2 100644
--- a/app/components/SimpleEditor/elements/track_change/TrackChangeControlViewTool.js
+++ b/app/components/SimpleEditor/elements/track_change/TrackChangeControlViewTool.js
@@ -2,9 +2,6 @@ import { Tool } from 'substance'
class TrackChangeControlViewTool extends Tool {
- getClassNames () {
- return 'sm-target-track-change-toggle-view'
- }
renderButton ($$) {
const el = super.renderButton($$)
if (this.getViewMode()) el.addClass('track-changes-view-active')
@@ -18,9 +15,9 @@ class TrackChangeControlViewTool extends Tool {
}
getViewMode () {
- const editor = this.context.controller
- var trackChangesView = true
- // const { trackChangesView } = editor.state
+ const editor = this.context.editor
+
+ const { trackChangesView } = editor.state
return trackChangesView
}
}
--
GitLab