Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
98aeab28
Commit
98aeab28
authored
Jul 04, 2018
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix parallel diff lines content.
parent
eba05eb8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
2 deletions
+12
-2
app/assets/javascripts/diffs/components/diff_table_cell.vue
app/assets/javascripts/diffs/components/diff_table_cell.vue
+10
-2
app/assets/javascripts/diffs/components/parallel_diff_table_row.vue
.../javascripts/diffs/components/parallel_diff_table_row.vue
+2
-0
No files found.
app/assets/javascripts/diffs/components/diff_table_cell.vue
View file @
98aeab28
...
@@ -11,6 +11,8 @@ import {
...
@@ -11,6 +11,8 @@ import {
LINE_HOVER_CLASS_NAME
,
LINE_HOVER_CLASS_NAME
,
LINE_UNFOLD_CLASS_NAME
,
LINE_UNFOLD_CLASS_NAME
,
INLINE_DIFF_VIEW_TYPE
,
INLINE_DIFF_VIEW_TYPE
,
LINE_POSITION_LEFT
,
LINE_POSITION_RIGHT
,
}
from
'
../constants
'
;
}
from
'
../constants
'
;
export
default
{
export
default
{
...
@@ -65,11 +67,17 @@ export default {
...
@@ -65,11 +67,17 @@ export default {
computed
:
{
computed
:
{
...
mapGetters
([
'
isLoggedIn
'
]),
...
mapGetters
([
'
isLoggedIn
'
]),
normalizedLine
()
{
normalizedLine
()
{
let
normalizedLine
;
if
(
this
.
diffViewType
===
INLINE_DIFF_VIEW_TYPE
)
{
if
(
this
.
diffViewType
===
INLINE_DIFF_VIEW_TYPE
)
{
return
this
.
line
;
normalizedLine
=
this
.
line
;
}
else
if
(
this
.
linePosition
===
LINE_POSITION_LEFT
)
{
normalizedLine
=
this
.
line
.
left
;
}
else
if
(
this
.
linePosition
===
LINE_POSITION_RIGHT
)
{
normalizedLine
=
this
.
line
.
right
;
}
}
return
this
.
lineType
===
OLD_LINE_TYPE
?
this
.
line
.
left
:
this
.
line
.
right
;
return
normalizedLine
;
},
},
isMatchLine
()
{
isMatchLine
()
{
return
this
.
normalizedLine
.
type
===
MATCH_LINE_TYPE
;
return
this
.
normalizedLine
.
type
===
MATCH_LINE_TYPE
;
...
...
app/assets/javascripts/diffs/components/parallel_diff_table_row.vue
View file @
98aeab28
...
@@ -118,6 +118,7 @@ export default {
...
@@ -118,6 +118,7 @@ export default {
:diff-file=
"diffFile"
:diff-file=
"diffFile"
:line=
"line"
:line=
"line"
:is-content-line=
"true"
:is-content-line=
"true"
:line-position=
"linePositionLeft"
:line-type=
"parallelViewLeftLineType"
:line-type=
"parallelViewLeftLineType"
:diff-view-type=
"parallelDiffViewType"
:diff-view-type=
"parallelDiffViewType"
class=
"line_content parallel left-side"
class=
"line_content parallel left-side"
...
@@ -139,6 +140,7 @@ export default {
...
@@ -139,6 +140,7 @@ export default {
:diff-file=
"diffFile"
:diff-file=
"diffFile"
:line=
"line"
:line=
"line"
:is-content-line=
"true"
:is-content-line=
"true"
:line-position=
"linePositionRight"
:line-type=
"line.right.type"
:line-type=
"line.right.type"
:diff-view-type=
"parallelDiffViewType"
:diff-view-type=
"parallelDiffViewType"
class=
"line_content parallel right-side"
class=
"line_content parallel right-side"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment