Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
W
wax-prosemirror
Manage
Activity
Members
Labels
Plan
Issues
34
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
2
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
wax
wax-prosemirror
Merge requests
!143
Track changes
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Track changes
track-changes
into
master
Overview
0
Commits
25
Pipelines
0
Changes
47
Merged
Christos
requested to merge
track-changes
into
master
4 years ago
Overview
0
Commits
25
Pipelines
0
Changes
1
Expand
0
0
Merge request reports
Compare
version 13
version 18
36657bd3
4 years ago
version 17
c6faf222
4 years ago
version 16
59e9c4e1
4 years ago
version 15
5ae2a33e
4 years ago
version 14
2685b02b
4 years ago
version 13
be700e1e
4 years ago
version 12
669373b3
4 years ago
version 11
813d9731
4 years ago
version 10
e7329b36
4 years ago
version 9
4699409a
4 years ago
version 8
46d00294
4 years ago
version 7
46e530a5
4 years ago
version 6
cda7d479
4 years ago
version 5
172ea43c
4 years ago
version 4
25793f92
4 years ago
version 3
9f7b1630
4 years ago
version 2
a0033038
4 years ago
version 1
a1cc99b9
4 years ago
master (base)
and
version 14
latest version
db37543c
25 commits,
4 years ago
version 18
36657bd3
24 commits,
4 years ago
version 17
c6faf222
23 commits,
4 years ago
version 16
59e9c4e1
22 commits,
4 years ago
version 15
5ae2a33e
19 commits,
4 years ago
version 14
2685b02b
18 commits,
4 years ago
version 13
be700e1e
17 commits,
4 years ago
version 12
669373b3
16 commits,
4 years ago
version 11
813d9731
15 commits,
4 years ago
version 10
e7329b36
14 commits,
4 years ago
version 9
4699409a
13 commits,
4 years ago
version 8
46d00294
12 commits,
4 years ago
version 7
46e530a5
11 commits,
4 years ago
version 6
cda7d479
10 commits,
4 years ago
version 5
172ea43c
9 commits,
4 years ago
version 4
25793f92
8 commits,
4 years ago
version 3
9f7b1630
7 commits,
4 years ago
version 2
a0033038
6 commits,
4 years ago
version 1
a1cc99b9
5 commits,
4 years ago
Show latest version
1 file
+
31
−
0
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
wax-prosemirror-services/src/TrackChangeService/AcceptTrackChangeService/AcceptTrackChange.js
+
31
−
0
Options
@@ -33,6 +33,19 @@ class AcceptTrackChange extends Tools {
);
tr
.
step
(
deletionStep
);
map
.
appendMap
(
deletionStep
.
getMap
());
}
else
if
(
node
.
attrs
.
track
&&
node
.
attrs
.
track
.
find
(
track
=>
track
.
type
===
'
insertion
'
)
)
{
const
track
=
node
.
attrs
.
track
.
filter
(
track
=>
track
.
type
!==
'
insertion
'
,
);
tr
.
setNodeMarkup
(
map
.
map
(
pos
),
null
,
Object
.
assign
(
node
.
attrs
.
track
,
{
track
}),
node
.
marks
,
);
}
else
if
(
node
.
marks
&&
node
.
marks
.
find
(
mark
=>
mark
.
type
.
name
===
'
insertion
'
)
@@ -61,6 +74,24 @@ class AcceptTrackChange extends Tools {
formatChangeMark
,
),
);
}
else
if
(
node
.
attrs
.
track
&&
node
.
attrs
.
track
.
find
(
track
=>
track
.
type
===
'
block_change
'
)
)
{
const
blockChangeTrack
=
node
.
attrs
.
track
.
find
(
track
=>
track
.
type
===
'
block_change
'
,
);
const
track
=
node
.
attrs
.
track
.
filter
(
track
=>
track
!==
blockChangeTrack
,
);
tr
.
setNodeMarkup
(
map
.
map
(
pos
),
null
,
Object
.
assign
(
node
.
attrs
.
track
,
{
track
}),
node
.
marks
,
);
}
});
if
(
tr
.
steps
.
length
)
dispatch
(
tr
);