Skip to content

Commit eee61fe

Browse files
authored
Merge pull request #3 from guestisp/fix-array-split
Fix header split
2 parents 318f3cf + 329f536 commit eee61fe

File tree

3 files changed

+9
-15
lines changed

3 files changed

+9
-15
lines changed

release/angular-link-header-parser.js

+4-7
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
if ( linkHeader.length == 0 )
3030
return new Error("Empty string provided!");
3131

32-
var links = linkHeader.split(",");
32+
var links = linkHeader.split("<").splice(1);
3333

3434
$log.debug("Links: ", links);
3535

@@ -72,14 +72,11 @@
7272
function _parseRelElement(relElement) {
7373
$log.debug("REL element to parse: ", relElement);
7474

75-
var items = relElement.split("=");
75+
var rel = relElement.match(/rel=["']?((?:.(?!["']?\s+(?:\S+)=|[>"']))+.)["']?/).slice(1);
7676

77-
items[ 1 ] = items[ 1 ].trim().toLowerCase();
78-
items[ 1 ] = items[ 1 ].replace(/"/g, "");
77+
$log.debug("Parsed REL element: ", rel);
7978

80-
$log.debug("Parsed REL element: ", items[ 1 ]);
81-
82-
return items[ 1 ];
79+
return rel;
8380
}
8481

8582
/**

release/angular-link-header-parser.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/angular-link-header-parser.js

+4-7
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
if ( linkHeader.length == 0 )
2929
return new Error("Empty string provided!");
3030

31-
var links = linkHeader.split(",");
31+
var links = linkHeader.split("<").splice(1);
3232

3333
$log.debug("Links: ", links);
3434

@@ -71,14 +71,11 @@
7171
function _parseRelElement(relElement) {
7272
$log.debug("REL element to parse: ", relElement);
7373

74-
var items = relElement.split("=");
74+
var rel = relElement.match(/rel=["']?((?:.(?!["']?\s+(?:\S+)=|[>"']))+.)["']?/).slice(1);
7575

76-
items[ 1 ] = items[ 1 ].trim().toLowerCase();
77-
items[ 1 ] = items[ 1 ].replace(/"/g, "");
76+
$log.debug("Parsed REL element: ", rel);
7877

79-
$log.debug("Parsed REL element: ", items[ 1 ]);
80-
81-
return items[ 1 ];
78+
return rel;
8279
}
8380

8481
/**

0 commit comments

Comments
 (0)