File tree 3 files changed +9
-15
lines changed
3 files changed +9
-15
lines changed Original file line number Diff line number Diff line change 29
29
if ( linkHeader . length == 0 )
30
30
return new Error ( "Empty string provided!" ) ;
31
31
32
- var links = linkHeader . split ( "," ) ;
32
+ var links = linkHeader . split ( "<" ) . splice ( 1 ) ;
33
33
34
34
$log . debug ( "Links: " , links ) ;
35
35
72
72
function _parseRelElement ( relElement ) {
73
73
$log . debug ( "REL element to parse: " , relElement ) ;
74
74
75
- var items = relElement . split ( "=" ) ;
75
+ var rel = relElement . match ( / r e l = [ " ' ] ? ( (?: . (? ! [ " ' ] ? \s + (?: \S + ) = | [ > " ' ] ) ) + . ) [ " ' ] ? / ) . slice ( 1 ) ;
76
76
77
- items [ 1 ] = items [ 1 ] . trim ( ) . toLowerCase ( ) ;
78
- items [ 1 ] = items [ 1 ] . replace ( / " / g, "" ) ;
77
+ $log . debug ( "Parsed REL element: " , rel ) ;
79
78
80
- $log . debug ( "Parsed REL element: " , items [ 1 ] ) ;
81
-
82
- return items [ 1 ] ;
79
+ return rel ;
83
80
}
84
81
85
82
/**
Original file line number Diff line number Diff line change 28
28
if ( linkHeader . length == 0 )
29
29
return new Error ( "Empty string provided!" ) ;
30
30
31
- var links = linkHeader . split ( "," ) ;
31
+ var links = linkHeader . split ( "<" ) . splice ( 1 ) ;
32
32
33
33
$log . debug ( "Links: " , links ) ;
34
34
71
71
function _parseRelElement ( relElement ) {
72
72
$log . debug ( "REL element to parse: " , relElement ) ;
73
73
74
- var items = relElement . split ( "=" ) ;
74
+ var rel = relElement . match ( / r e l = [ " ' ] ? ( (?: . (? ! [ " ' ] ? \s + (?: \S + ) = | [ > " ' ] ) ) + . ) [ " ' ] ? / ) . slice ( 1 ) ;
75
75
76
- items [ 1 ] = items [ 1 ] . trim ( ) . toLowerCase ( ) ;
77
- items [ 1 ] = items [ 1 ] . replace ( / " / g, "" ) ;
76
+ $log . debug ( "Parsed REL element: " , rel ) ;
78
77
79
- $log . debug ( "Parsed REL element: " , items [ 1 ] ) ;
80
-
81
- return items [ 1 ] ;
78
+ return rel ;
82
79
}
83
80
84
81
/**
You can’t perform that action at this time.
0 commit comments