@@ -16,8 +16,8 @@ function changeHash(hash) {
16
16
}
17
17
}
18
18
19
- function selectRange ( $list , $select , $from ) {
20
- $list . closest ( 'tr' ) . removeClass ( 'active' ) ;
19
+ function selectRange ( $linesEls , $selectionEndEl , $selectionStartEls ) {
20
+ $linesEls . closest ( 'tr' ) . removeClass ( 'active' ) ;
21
21
22
22
// add hashchange to permalink
23
23
const $refInNewIssue = $ ( 'a.ref-in-new-issue' ) ;
@@ -35,9 +35,7 @@ function selectRange($list, $select, $from) {
35
35
} ;
36
36
37
37
const updateViewGitBlameFragment = function ( anchor ) {
38
- if ( $viewGitBlame . length === 0 ) {
39
- return ;
40
- }
38
+ if ( $viewGitBlame . length === 0 ) return ;
41
39
let href = $viewGitBlame . attr ( 'href' ) ;
42
40
href = `${ href . replace ( / # L \d + $ | # L \d + - L \d + $ / , '' ) } ` ;
43
41
if ( anchor . length !== 0 ) {
@@ -47,17 +45,15 @@ function selectRange($list, $select, $from) {
47
45
} ;
48
46
49
47
const updateCopyPermalinkUrl = function ( anchor ) {
50
- if ( $copyPermalink . length === 0 ) {
51
- return ;
52
- }
48
+ if ( $copyPermalink . length === 0 ) return ;
53
49
let link = $copyPermalink . attr ( 'data-url' ) ;
54
50
link = `${ link . replace ( / # L \d + $ | # L \d + - L \d + $ / , '' ) } #${ anchor } ` ;
55
51
$copyPermalink . attr ( 'data-url' , link ) ;
56
52
} ;
57
53
58
- if ( $from ) {
59
- let a = parseInt ( $select . attr ( 'rel' ) . slice ( 1 ) ) ;
60
- let b = parseInt ( $from . attr ( 'rel' ) . slice ( 1 ) ) ;
54
+ if ( $selectionStartEls ) {
55
+ let a = parseInt ( $selectionEndEl . attr ( 'rel' ) . slice ( 1 ) ) ;
56
+ let b = parseInt ( $selectionStartEls . attr ( 'rel' ) . slice ( 1 ) ) ;
61
57
let c ;
62
58
if ( a !== b ) {
63
59
if ( a > b ) {
@@ -69,7 +65,7 @@ function selectRange($list, $select, $from) {
69
65
for ( let i = a ; i <= b ; i ++ ) {
70
66
classes . push ( `[rel=L${ i } ]` ) ;
71
67
}
72
- $list . filter ( classes . join ( ',' ) ) . each ( function ( ) {
68
+ $linesEls . filter ( classes . join ( ',' ) ) . each ( function ( ) {
73
69
$ ( this ) . closest ( 'tr' ) . addClass ( 'active' ) ;
74
70
} ) ;
75
71
changeHash ( `#L${ a } -L${ b } ` ) ;
@@ -80,12 +76,12 @@ function selectRange($list, $select, $from) {
80
76
return ;
81
77
}
82
78
}
83
- $select . closest ( 'tr' ) . addClass ( 'active' ) ;
84
- changeHash ( `#${ $select . attr ( 'rel' ) } ` ) ;
79
+ $selectionEndEl . closest ( 'tr' ) . addClass ( 'active' ) ;
80
+ changeHash ( `#${ $selectionEndEl . attr ( 'rel' ) } ` ) ;
85
81
86
- updateIssueHref ( $select . attr ( 'rel' ) ) ;
87
- updateViewGitBlameFragment ( $select . attr ( 'rel' ) ) ;
88
- updateCopyPermalinkUrl ( $select . attr ( 'rel' ) ) ;
82
+ updateIssueHref ( $selectionEndEl . attr ( 'rel' ) ) ;
83
+ updateViewGitBlameFragment ( $selectionEndEl . attr ( 'rel' ) ) ;
84
+ updateCopyPermalinkUrl ( $selectionEndEl . attr ( 'rel' ) ) ;
89
85
}
90
86
91
87
function showLineButton ( ) {
@@ -158,17 +154,17 @@ export function initRepoCodeView() {
158
154
159
155
$ ( window ) . on ( 'hashchange' , ( ) => {
160
156
let m = window . location . hash . match ( rangeAnchorRegex ) ;
161
- let $list ;
157
+ let $linesEls ;
162
158
if ( $ ( 'div.blame' ) . length ) {
163
- $list = $ ( '.code-view td.lines-code.blame-code' ) ;
159
+ $linesEls = $ ( '.code-view td.lines-code.blame-code' ) ;
164
160
} else {
165
- $list = $ ( '.code-view td.lines-code' ) ;
161
+ $linesEls = $ ( '.code-view td.lines-code' ) ;
166
162
}
167
163
let $first ;
168
164
if ( m ) {
169
- $first = $list . filter ( `[rel=${ m [ 1 ] } ]` ) ;
165
+ $first = $linesEls . filter ( `[rel=${ m [ 1 ] } ]` ) ;
170
166
if ( $first . length ) {
171
- selectRange ( $list , $first , $list . filter ( `[rel=${ m [ 2 ] } ]` ) ) ;
167
+ selectRange ( $linesEls , $first , $linesEls . filter ( `[rel=${ m [ 2 ] } ]` ) ) ;
172
168
173
169
// show code view menu marker (don't show in blame page)
174
170
if ( $ ( 'div.blame' ) . length === 0 ) {
@@ -181,9 +177,9 @@ export function initRepoCodeView() {
181
177
}
182
178
m = window . location . hash . match ( singleAnchorRegex ) ;
183
179
if ( m ) {
184
- $first = $list . filter ( `[rel=L${ m [ 2 ] } ]` ) ;
180
+ $first = $linesEls . filter ( `[rel=L${ m [ 2 ] } ]` ) ;
185
181
if ( $first . length ) {
186
- selectRange ( $list , $first ) ;
182
+ selectRange ( $linesEls , $first ) ;
187
183
188
184
// show code view menu marker (don't show in blame page)
189
185
if ( $ ( 'div.blame' ) . length === 0 ) {
0 commit comments