Skip to content
Snippets Groups Projects
Commit f877dd58 authored by chris's avatar chris
Browse files

fix boxes info

parent 93513230
No related branches found
No related tags found
1 merge request!543pass viewId
...@@ -99,7 +99,6 @@ const markDeletion = (tr, from, to, user, date, group, viewId) => { ...@@ -99,7 +99,6 @@ const markDeletion = (tr, from, to, user, date, group, viewId) => {
node.type.name === 'figure' node.type.name === 'figure'
) { ) {
const track = node.attrs.track.slice(); const track = node.attrs.track.slice();
console.log('viewId', viewId);
track.push({ track.push({
type: 'deletion', type: 'deletion',
user: user.userId, user: user.userId,
...@@ -109,7 +108,6 @@ const markDeletion = (tr, from, to, user, date, group, viewId) => { ...@@ -109,7 +108,6 @@ const markDeletion = (tr, from, to, user, date, group, viewId) => {
group, group,
viewid: viewId, viewid: viewId,
}); });
console.log('track', track);
tr.setNodeMarkup( tr.setNodeMarkup(
deletionMap.map(pos), deletionMap.map(pos),
null, null,
......
...@@ -58,8 +58,6 @@ export default ({ trackChangeId, top, recalculateTops, trackChange }) => { ...@@ -58,8 +58,6 @@ export default ({ trackChangeId, top, recalculateTops, trackChange }) => {
}; };
const focusOnBlcock = trackData => { const focusOnBlcock = trackData => {
console.log(trackData);
console.log(pmViews, viewId);
pmViews[viewId].dispatch( pmViews[viewId].dispatch(
pmViews[viewId].state.tr.setSelection( pmViews[viewId].state.tr.setSelection(
new TextSelection( new TextSelection(
......
...@@ -127,6 +127,7 @@ const TrackChangesBox = props => { ...@@ -127,6 +127,7 @@ const TrackChangesBox = props => {
const labelBlockChange = 'changed '; const labelBlockChange = 'changed ';
let textBlockChange = ''; let textBlockChange = '';
let textBlockInsert = ''; let textBlockInsert = '';
let textBlockRemoved = '';
if (trackData.type && trackData.type.name === 'format_change') { if (trackData.type && trackData.type.name === 'format_change') {
const { before, after } = trackData.attrs; const { before, after } = trackData.attrs;
...@@ -156,6 +157,9 @@ const TrackChangesBox = props => { ...@@ -156,6 +157,9 @@ const TrackChangesBox = props => {
if (track.type === 'block_change') { if (track.type === 'block_change') {
textBlockChange = `${track.before.type} to ${trackData.node.type.name}`; textBlockChange = `${track.before.type} to ${trackData.node.type.name}`;
} }
if (track.type === 'deletion') {
textBlockRemoved = trackData.node.type.name;
}
} }
return ( return (
...@@ -198,6 +202,12 @@ const TrackChangesBox = props => { ...@@ -198,6 +202,12 @@ const TrackChangesBox = props => {
<Text>{textBlockInsert}</Text> <Text>{textBlockInsert}</Text>
</ActionWrapper> </ActionWrapper>
)} )}
{textBlockRemoved !== '' && (
<ActionWrapper>
<Label>{labelRemoved}</Label>
<Text>{textBlockRemoved}</Text>
</ActionWrapper>
)}
{textBlockChange !== '' && ( {textBlockChange !== '' && (
<ActionWrapper> <ActionWrapper>
<Label>{labelBlockChange}</Label> <Label>{labelBlockChange}</Label>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment