Skip to content
Snippets Groups Projects
Commit 5fc8aec1 authored by Jacob Schatz's avatar Jacob Schatz
Browse files

Make line numbers certain text unselectable

parent 9bdcd180
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -383,3 +383,12 @@ table {
margin-right: -$gl-padding;
border-top: 1px solid $border-color;
}
.unselectable, .unselectable a{
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
\ No newline at end of file
Loading
Loading
@@ -8,9 +8,9 @@
- line_new = index + @form.since
- line_old = line_new - @form.offset
%tr.line_holder
%td.old_line.diff-line-num{data: {linenumber: line_old}}
%td.old_line.diff-line-num.unselectable{data: {linenumber: line_old}}
= link_to raw(line_old), "#"
%td.new_line.diff-line-num
%td.new_line.diff-line-num.unselectable
= link_to raw(line_new) , "#"
%td.line_content.noteable_line==#{' ' * @form.indent}#{line}
 
Loading
Loading
Loading
Loading
@@ -14,12 +14,12 @@
- @diff_lines.each do |line|
%tr.line_holder{ class: "#{line.type}" }
- if line.type == "match"
%td.old_line.diff-line-num= "..."
%td.new_line.diff-line-num= "..."
%td.old_line.diff-line-num.unselectable= "..."
%td.new_line.diff-line-num.unselectable= "..."
%td.line_content.match= line.text
- else
%td.old_line.diff-line-num
%td.new_line.diff-line-num
%td.old_line.diff-line-num.unselectable
%td.new_line.diff-line-num.unselectable
%td.line_content{class: "#{line.type}"}= diff_line_content(line.text)
- else
.nothing-here-block No changes.
%td.old_line.diff-line-num{data: {linenumber: line_old},
%td.old_line.diff-line-num.unselectable{data: {linenumber: line_old},
class: [unfold_bottom_class(bottom), unfold_class(!new_file)]}
\...
%td.new_line.diff-line-num{data: {linenumber: line_new},
%td.new_line.diff-line-num.unselectable{data: {linenumber: line_new},
class: [unfold_bottom_class(bottom), unfold_class(!new_file)]}
\...
%td.line_content.match= line
%td.old_line.diff-line-num
%td.old_line.diff-line-num.unselectable
%td.line_content.parallel.match= line
%td.new_line.diff-line-num
%td.new_line.diff-line-num.unselectable
%td.line_content.parallel.match= line
Loading
Loading
@@ -9,12 +9,12 @@
= render "projects/diffs/match_line_parallel", { line: left[:text],
line_old: left[:number], line_new: right[:number] }
- elsif left[:type] == 'nonewline'
%td.old_line.diff-line-num
%td.old_line.diff-line-num.unselectable
%td.line_content.parallel.match= left[:text]
%td.new_line.diff-line-num
%td.new_line.diff-line-num.unselectable
%td.line_content.parallel.match= left[:text]
- else
%td.old_line.diff-line-num{id: left[:line_code], class: "#{left[:type]}"}
%td.old_line.diff-line-num.unselectable{id: left[:line_code], class: "#{left[:type]}"}
= link_to raw(left[:number]), "##{left[:line_code]}", id: left[:line_code]
- if @comments_allowed && can?(current_user, :create_note, @project)
= link_to_new_diff_note(left[:line_code], 'old')
Loading
Loading
@@ -27,7 +27,7 @@
- new_line_class = nil
- new_line_code = left[:line_code]
 
%td.new_line.diff-line-num{id: new_line_code, class: "#{new_line_class}", data: { linenumber: right[:number] }}
%td.new_line.diff-line-num.unselectable{id: new_line_code, class: "#{new_line_class}", data: { linenumber: right[:number] }}
= link_to raw(right[:number]), "##{new_line_code}", id: new_line_code
- if @comments_allowed && can?(current_user, :create_note, @project)
= link_to_new_diff_note(right[:line_code], 'new')
Loading
Loading
Loading
Loading
@@ -17,15 +17,15 @@
= render "projects/diffs/match_line", {line: line.text,
line_old: line_old, line_new: line.new_pos, bottom: false, new_file: diff_file.new_file}
- elsif type == 'nonewline'
%td.old_line.diff-line-num
%td.new_line.diff-line-num
%td.old_line.diff-line-num.unselectable
%td.new_line.diff-line-num.unselectable
%td.line_content.match= line.text
- else
%td.old_line.diff-line-num{class: type}
%td.old_line.diff-line-num.unselectable{class: type}
= link_to raw(type == "new" ? " " : line_old), "##{line_code}", id: line_code
- if @comments_allowed && can?(current_user, :create_note, @project)
= link_to_new_diff_note(line_code)
%td.new_line.diff-line-num{class: type, data: {linenumber: line.new_pos}}
%td.new_line.diff-line-num.unselectable{class: type, data: {linenumber: line.new_pos}}
= link_to raw(type == "old" ? " " : line.new_pos), "##{line_code}", id: line_code
%td.line_content{class: "noteable_line #{type} #{line_code}", data: { line_code: line_code }}= diff_line_content(line.text)
 
Loading
Loading
Loading
Loading
@@ -16,13 +16,13 @@
- line_code = generate_line_code(note.file_path, line)
%tr.line_holder{ id: line_code, class: "#{type}" }
- if type == "match"
%td.old_line.diff-line-num= "..."
%td.new_line.diff-line-num= "..."
%td.old_line.diff-line-num.unselectable= "..."
%td.new_line.diff-line-num.unselectable= "..."
%td.line_content.match= line.text
- else
%td.old_line.diff-line-num
%td.old_line.diff-line-num.unselectable
= raw(type == "new" ? " " : line.old_pos)
%td.new_line.diff-line-num
%td.new_line.diff-line-num.unselectable
= raw(type == "old" ? " " : line.new_pos)
%td.line_content{class: "noteable_line #{type} #{line_code}", line_code: line_code}= diff_line_content(line.text)
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment