File tree 4 files changed +14
-12
lines changed
4 files changed +14
-12
lines changed Original file line number Diff line number Diff line change @@ -70,11 +70,12 @@ methods.parseJSON = (str) => {
70
70
71
71
methods . resolve = ( options , uri , { $ref = '' } = { } ) => {
72
72
const uriToLoad = resolve ( uri , $ref )
73
- if ( parse ( uriToLoad ) . protocol === 'file:' ) {
74
- return options . fsResolver . resolve ( uriToLoad . split ( '#' ) [ 0 ] )
73
+ const protocol = parse ( uriToLoad ) . protocol
74
+ if ( protocol && protocol . substr ( 0 , 4 ) === 'http' ) {
75
+ return options . httpResolver . resolve ( uriToLoad . split ( '#' ) [ 0 ] )
75
76
}
76
77
77
- return options . httpResolver . resolve ( uriToLoad . split ( '#' ) [ 0 ] )
78
+ return options . fsResolver . resolve ( uriToLoad . split ( '#' ) [ 0 ] )
78
79
}
79
80
80
81
Original file line number Diff line number Diff line change @@ -87,11 +87,11 @@ methods.isParsable = (content) => {
87
87
methods . resolve = ( options , uri , { $ref = '' } = { } ) => {
88
88
const uriToLoad = resolve ( uri , $ref )
89
89
const protocol = parse ( uriToLoad ) . protocol
90
- if ( protocol === 'file:' || protocol === 'file ' ) {
91
- return options . fsResolver . resolve ( uriToLoad . split ( '#' ) [ 0 ] )
90
+ if ( protocol && protocol . substr ( 0 , 4 ) === 'http ' ) {
91
+ return options . httpResolver . resolve ( uriToLoad . split ( '#' ) [ 0 ] )
92
92
}
93
93
94
- return options . httpResolver . resolve ( uriToLoad . split ( '#' ) [ 0 ] )
94
+ return options . fsResolver . resolve ( uriToLoad . split ( '#' ) [ 0 ] )
95
95
}
96
96
97
97
methods . normalizeRequestItem = ( item ) => {
Original file line number Diff line number Diff line change @@ -122,11 +122,12 @@ methods.traverse = (content, { $ref = '#/' } = {}) => {
122
122
123
123
methods . resolve = ( options , uri , { $ref = '' } = { } ) => {
124
124
const uriToLoad = resolve ( uri , $ref )
125
- if ( parse ( uriToLoad ) . protocol === 'file:' ) {
126
- return options . fsResolver . resolve ( uriToLoad . split ( '#' ) [ 0 ] )
125
+ const protocol = parse ( uriToLoad ) . protocol
126
+ if ( protocol && protocol . substr ( 0 , 4 ) === 'http' ) {
127
+ return options . httpResolver . resolve ( uriToLoad . split ( '#' ) [ 0 ] )
127
128
}
128
129
129
- return options . httpResolver . resolve ( uriToLoad . split ( '#' ) [ 0 ] )
130
+ return options . fsResolver . resolve ( uriToLoad . split ( '#' ) [ 0 ] )
130
131
}
131
132
132
133
methods . objectMap = ( obj , func ) => {
Original file line number Diff line number Diff line change @@ -125,11 +125,11 @@ methods.isParsable = (content) => {
125
125
methods . resolve = ( options , uri , { $ref = '' } = { } ) => {
126
126
const uriToLoad = resolve ( uri , $ref )
127
127
const protocol = parse ( uriToLoad ) . protocol
128
- if ( protocol === 'file:' || protocol === 'file' || ! protocol ) {
129
- return options . fsResolver . resolve ( uriToLoad . split ( '#' ) [ 0 ] )
128
+ if ( protocol && protocol . substr ( 0 , 4 ) === 'http' ) {
129
+ return options . httpResolver . resolve ( uriToLoad . split ( '#' ) [ 0 ] )
130
130
}
131
131
132
- return options . httpResolver . resolve ( uriToLoad . split ( '#' ) [ 0 ] )
132
+ return options . fsResolver . resolve ( uriToLoad . split ( '#' ) [ 0 ] )
133
133
}
134
134
135
135
/**
You can’t perform that action at this time.
0 commit comments