Skip to content

Refactor startsWith usage for IE11 compatibility #1153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 14, 2017
Merged

Refactor startsWith usage for IE11 compatibility #1153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0113a5
Use lodash startsWith instead of ES6 builtin method
shockey Oct 14, 2017
c2b3214
Merge branch 'master' into bug/1152-startswith-usage
shockey Oct 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import isObject from 'lodash/isObject'
import startsWith from 'lodash/startsWith'

const toLower = str => String.prototype.toLowerCase.call(str)
const escapeString = (str) => {
Expand All @@ -12,7 +13,7 @@ export function isOAS3(spec) {
return false
}

return oasVersion.startsWith('3.0.0')
return startsWith(oasVersion, '3')
}

export function isSwagger2(spec) {
Expand All @@ -21,7 +22,7 @@ export function isSwagger2(spec) {
return false
}

return swaggerVersion.startsWith('2')
return startsWith(swaggerVersion, '2')
}

// Strategy for determining operationId
Expand Down
3 changes: 2 additions & 1 deletion src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import cloneDeep from 'lodash/cloneDeep'
import assign from 'lodash/assign'
import startsWith from 'lodash/startsWith'
import Url from 'url'
import Http, {makeHttp, serializeRes, serializeHeaders} from './http'
import Resolver, {clearCache} from './resolver'
Expand Down Expand Up @@ -82,7 +83,7 @@ Swagger.prototype.applyDefaults = function () {
const spec = this.spec
const specUrl = this.url
// TODO: OAS3: support servers here
if (specUrl && specUrl.startsWith('http')) {
if (specUrl && startsWith(specUrl, 'http')) {
const parsed = Url.parse(specUrl)
if (!spec.host) {
spec.host = parsed.host
Expand Down