Skip to content

Commit cfd35ec

Browse files
Fix resolver
1 parent a638b3c commit cfd35ec

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

index.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ module.exports = function(input, inputMap) {
2323
var addDependency = this.addDependency;
2424
var emitWarning = this.emitWarning || function() {};
2525

26-
var match1 = regex1.exec(input); // TODO: Take into account multi-occurences too
27-
var match2 = regex2.exec(input); // TODO: Take into account multi-occurences too
26+
var matchP1 = input.match(regex1);
27+
var matchP2 = input.match(regex2);
2828

29-
var match = (match1 && match1[1]) || (match2 && match2[1]);
29+
var match = matchP1 || matchP2;
3030

31-
if (match1 != null && match2 != null) {
32-
match = (match1.index > match2.index) ? match1[1] : match2[1];
31+
if (matchP1 && matchP2) {
32+
match = (matchP1.index > matchP2.index) ? matchP1 : matchP2;
3333
}
3434

3535
if(match) {
36-
var url = match;
36+
var url = match[1];
3737
var dataUrlMatch = regexDataUrl.exec(url);
3838
var callback = this.async();
3939
if(dataUrlMatch) {

0 commit comments

Comments
 (0)