From 9cb84e937bf2ab8e959e6cb6ef398daa9e4d5646 Mon Sep 17 00:00:00 2001 From: chris <kokosias@yahoo.gr> Date: Thu, 5 Jan 2017 17:46:24 +0200 Subject: [PATCH] minor correction --- .../track_change/TrackChangeComponent.js | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/app/components/SimpleEditor/elements/track_change/TrackChangeComponent.js b/app/components/SimpleEditor/elements/track_change/TrackChangeComponent.js index 1b7a3bd..29ccb21 100644 --- a/app/components/SimpleEditor/elements/track_change/TrackChangeComponent.js +++ b/app/components/SimpleEditor/elements/track_change/TrackChangeComponent.js @@ -72,9 +72,9 @@ class TrackChangeComponent extends AnnotationComponent { deleteNode(tx, { nodeId: nodeId }) if (status === 'delete') self.context.surface.delete(tx, nodeData) }) - const nextNodeData = self.buildNodeData(nextNodeId) - self.context.surface.setSelection(nextNodeData.selection) - self.context.controller.scrollTo(nextNodeId) + if (nextNodeId) { + this.focusToNext(nextNodeId) + } } rejectTrackChange () { @@ -90,9 +90,10 @@ class TrackChangeComponent extends AnnotationComponent { deleteNode(tx, { nodeId: nodeId }) if (status === 'add') self.context.surface.delete(tx, nodeData) }) - const nextNodeData = self.buildNodeData(nextNodeId) - self.context.surface.setSelection(nextNodeData.selection) - self.context.controller.scrollTo(nextNodeId) + + if (nextNodeId) { + this.focusToNext(nextNodeId) + } } buildNodeData (nodeId) { @@ -139,6 +140,12 @@ class TrackChangeComponent extends AnnotationComponent { return } + focusToNext (nextNodeId) { + const nextNodeData = this.buildNodeData(nextNodeId) + this.context.surface.setSelection(nextNodeData.selection) + this.context.controller.scrollTo(nextNodeId) + } + sortNodes (nodes) { let trackChanges = clone(nodes) const ds = this.getDocumentSession() -- GitLab