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
aa5f306d
Commit
aa5f306d
authored
10 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6860 from hszcg/dev
Add support for side-by-side inline comments
parents
cb20ab02
84870438
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
52 additions
and
78 deletions
+52
-78
app/assets/stylesheets/sections/diff.scss
app/assets/stylesheets/sections/diff.scss
+8
-17
app/assets/stylesheets/sections/notes.scss
app/assets/stylesheets/sections/notes.scss
+1
-0
app/views/projects/commits/_parallel_view.html.haml
app/views/projects/commits/_parallel_view.html.haml
+33
-50
app/views/projects/notes/_diff_notes_with_reply_parallel.html.haml
.../projects/notes/_diff_notes_with_reply_parallel.html.haml
+10
-11
No files found.
app/assets/stylesheets/sections/diff.scss
View file @
aa5f306d
...
@@ -63,23 +63,14 @@
...
@@ -63,23 +63,14 @@
}
}
}
}
.text-file-parallel
div
{
tr
.line_holder.parallel
{
display
:
inline-block
;
.old_line
,
.new_line
,
.diff_line
{
padding-bottom
:
16px
;
min-width
:
50px
;
}
.diff-side
{
overflow-x
:
scroll
;
width
:
508px
;
}
.diff-side.diff-side-left
{
overflow-y
:hidden
;
}
}
.diff-side
table
,
td
.diff-middle
table
{
td
.line_content.parallel
{
width
:
50%
;
}
}
.diff-middle
{
width
:
114px
;
vertical-align
:
top
;
overflow
:
hidden
}
}
.old_line
,
.new_line
,
.diff_line
{
.old_line
,
.new_line
,
.diff_line
{
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/sections/notes.scss
View file @
aa5f306d
...
@@ -139,6 +139,7 @@ ul.notes {
...
@@ -139,6 +139,7 @@ ul.notes {
background-color
:
#fff
;
background-color
:
#fff
;
border-width
:
1px
0
;
border-width
:
1px
0
;
padding-top
:
0
;
padding-top
:
0
;
vertical-align
:
top
;
li
{
li
{
padding
:
5px
;
padding
:
5px
;
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/commits/_parallel_view.html.haml
View file @
aa5f306d
...
@@ -2,54 +2,37 @@
...
@@ -2,54 +2,37 @@
-
old_lines
,
new_lines
=
parallel_diff_lines
(
project
,
@commit
,
diff
,
file
)
-
old_lines
,
new_lines
=
parallel_diff_lines
(
project
,
@commit
,
diff
,
file
)
-
num_lines
=
old_lines
.
length
-
num_lines
=
old_lines
.
length
%div
.text-file-parallel
%div
.text-file
%div
.diff-side.diff-side-left
%table
-
old_lines
.
each
do
|
line
|
%tr
.line_holder.parallel
-
if
line
.
type
==
:file_created
%td
.line_content.parallel
=
"File was created"
-
elsif
line
.
type
==
:deleted
%td
.line_content
{
class:
"parallel noteable_line old #{line.code}"
,
"line_code"
=>
line
.
code
}=
line
.
content
-
else
line
.
type
==
:no_change
%td
.line_content.parallel
=
line
.
content
%div
.diff-middle
%table
%table
-
num_lines
.
times
do
|
index
|
-
num_lines
.
times
do
|
index
|
%tr
-
new_line
=
new_lines
[
index
]
-
if
old_lines
[
index
].
type
==
:deleted
-
old_line
=
old_lines
[
index
]
%td
.old_line.old
=
old_lines
[
index
].
num
-
else
%td
.old_line
=
old_lines
[
index
].
num
%td
.diff_line
=
""
-
if
new_lines
[
index
].
type
==
:added
%td
.new_line.new
=
new_lines
[
index
].
num
-
else
%td
.new_line
=
new_lines
[
index
].
num
%div
.diff-side.diff-side-right
%table
-
new_lines
.
each
do
|
line
|
%tr
.line_holder.parallel
%tr
.line_holder.parallel
-
if
line
.
type
==
:file_deleted
-# For old line
-
if
old_line
.
type
==
:file_created
%td
.old_line
=
old_line
.
num
%td
.line_content.parallel
=
"File was created"
-
elsif
old_line
.
type
==
:deleted
%td
.old_line.old
=
old_line
.
num
%td
.line_content
{
class:
"parallel noteable_line old #{old_line.code}"
,
"line_code"
=>
old_line
.
code
}=
old_line
.
content
-
else
old_line
.
type
==
:no_change
%td
.old_line
=
old_line
.
num
%td
.line_content.parallel
=
old_line
.
content
-# For new line
-
if
new_line
.
type
==
:file_deleted
%td
.new_line
=
new_line
.
num
%td
.line_content.parallel
=
"File was deleted"
%td
.line_content.parallel
=
"File was deleted"
-
elsif
line
.
type
==
:added
-
elsif
new_line
.
type
==
:added
%td
.line_content
{
class:
"parallel noteable_line new #{line.code}"
,
"line_code"
=>
line
.
code
}=
line
.
content
%td
.new_line.new
=
new_line
.
num
-
else
line
.
type
==
:no_change
%td
.line_content
{
class:
"parallel noteable_line new #{new_line.code}"
,
"line_code"
=>
new_line
.
code
}=
new_line
.
content
%td
.line_content.parallel
=
line
.
content
-
else
new_line
.
type
==
:no_change
%td
.new_line
=
new_line
.
num
:javascript
%td
.line_content.parallel
=
new_line
.
content
$
(
'
.diff-side-right
'
).
on
(
'
scroll
'
,
function
(){
$
(
'
.diff-side-left, .diff-middle
'
).
scrollTop
(
$
(
this
).
scrollTop
());
-
if
@reply_allowed
$
(
'
.diff-side-left
'
).
scrollLeft
(
$
(
this
).
scrollLeft
());
-
comments1
=
@line_notes
.
select
{
|
n
|
n
.
line_code
==
old_line
.
code
}.
sort_by
(
&
:created_at
)
});
-
comments2
=
@line_notes
.
select
{
|
n
|
n
.
line_code
==
new_line
.
code
}.
sort_by
(
&
:created_at
)
-
unless
comments1
.
empty?
and
comments2
.
empty?
=
render
"projects/notes/diff_notes_with_reply_parallel"
,
notes1:
comments1
,
notes2:
comments2
$
(
'
.diff-side-left
'
).
on
(
'
scroll
'
,
function
(){
$
(
'
.diff-side-right, .diff-middle
'
).
scrollTop
(
$
(
this
).
scrollTop
());
// might never be relevant
$
(
'
.diff-side-right
'
).
scrollLeft
(
$
(
this
).
scrollLeft
());
});
This diff is collapsed.
Click to expand it.
app/views/projects/notes/_diff_notes_with_reply_parallel.html.haml
View file @
aa5f306d
-
note1
=
notes1
.
first
# example note
-
note1
=
notes1
.
first
# example note
-
note2
=
notes2
.
first
# example note
-
note2
=
notes2
.
first
# example note
-# Check if line want not changed since comment was left
/- if !defined?(line) || line == note.diff_line
%tr
.notes_holder.js-toggle-content
%tr
.notes_holder.js-toggle-content
-# Check if line want not changed since comment was left
/- if !defined?(line1) || line1 == note1.diff_line
-
if
note1
-
if
note1
%td
.notes_line
%span
.btn.disabled
%i
.icon-comment
=
notes1
.
count
%td
.notes_content
%td
.notes_content
%ul
.notes
{
rel:
note1
.
discussion_id
}
%ul
.notes
{
rel:
note1
.
discussion_id
}
=
render
notes1
=
render
notes1
=
render
"projects/notes/discussion_reply_button"
,
note:
note1
=
render
"projects/notes/discussion_reply_button"
,
note:
note1
%td
.notes_line2
%span
.btn.disabled.parallel-comment
%i
.icon-comment
=
notes1
.
count
-
else
-
else
%td
=
""
%td
=
""
%td
=
""
%td
=
""
%td
=
""
-# Check if line want not changed since comment was left
/- if !defined?(line2) || line2 == note2.diff_line
-
if
note2
-
if
note2
%td
.notes_line
%td
.notes_line
%span
.btn.disabled
.parallel-comment
%span
.btn.disabled
%i
.icon-comment
%i
.icon-comment
=
notes2
.
count
=
notes2
.
count
%td
.notes_content
%td
.notes_content
%ul
.notes
{
rel:
note2
.
discussion_id
}
%ul
.notes
{
rel:
note2
.
discussion_id
}
=
render
notes2
=
render
notes2
=
render
"projects/notes/discussion_reply_button"
,
note:
note2
=
render
"projects/notes/discussion_reply_button"
,
note:
note2
-
else
-
else
%td
=
""
%td
=
""
%td
=
""
%td
=
""
This diff is collapsed.
Click to expand it.
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