From 6c714c294c2338b33e2c6f6e65bec4bea34aee07 Mon Sep 17 00:00:00 2001 From: chris <kokosias@yahoo.gr> Date: Mon, 20 Feb 2017 20:40:22 +0200 Subject: [PATCH] initial track changes --- .../elements/track_change/TrackChangeControlTool.js | 5 +++++ .../elements/track_change/TrackChangeControlViewTool.js | 6 +++++- .../elements/track_change/TrackChangesProvider.js | 3 +-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/components/SimpleEditor/elements/track_change/TrackChangeControlTool.js b/app/components/SimpleEditor/elements/track_change/TrackChangeControlTool.js index d5b1d6c..a3ab7ad 100644 --- a/app/components/SimpleEditor/elements/track_change/TrackChangeControlTool.js +++ b/app/components/SimpleEditor/elements/track_change/TrackChangeControlTool.js @@ -1,6 +1,11 @@ import { Tool } from 'substance' class TrackChangeControlTool extends Tool { + + getClassNames () { + return 'sm-target-track-change-enable' + } + renderButton ($$) { const el = super.renderButton($$) diff --git a/app/components/SimpleEditor/elements/track_change/TrackChangeControlViewTool.js b/app/components/SimpleEditor/elements/track_change/TrackChangeControlViewTool.js index 9bbba44..83f0072 100644 --- a/app/components/SimpleEditor/elements/track_change/TrackChangeControlViewTool.js +++ b/app/components/SimpleEditor/elements/track_change/TrackChangeControlViewTool.js @@ -1,6 +1,10 @@ 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') @@ -15,8 +19,8 @@ class TrackChangeControlViewTool extends Tool { getViewMode () { const editor = this.context.editor - const { trackChangesView } = editor.state + return trackChangesView } } diff --git a/app/components/SimpleEditor/elements/track_change/TrackChangesProvider.js b/app/components/SimpleEditor/elements/track_change/TrackChangesProvider.js index 8e7ebe9..4406615 100644 --- a/app/components/SimpleEditor/elements/track_change/TrackChangesProvider.js +++ b/app/components/SimpleEditor/elements/track_change/TrackChangesProvider.js @@ -660,7 +660,6 @@ class TrackChangesProvider extends TOCProvider { getAllExistingTrackAnnotations () { const editorSession = this.getEditorSession() - // const selectionState = documentSession.getSelectionState() const selectionState = editorSession.getSelectionState() const annotations = selectionState.getAnnotationsForType('track-change') return annotations @@ -762,7 +761,7 @@ class TrackChangesProvider extends TOCProvider { // const lastChange = last(undoneChanges) // const op = last(lastChange.ops) // - // const isTrack = op.path[0].split('-').slice(0, -1).join('-') === 'track-change' + // const isTrack = op.path[0].split('-').slice(0, -1).join('-') === 'track-change } /* -- GitLab