Skip to content

Commit

Permalink
browser.js getOsData: replaced for..in by for..of loop
Browse files Browse the repository at this point in the history
Harmmonize with previous commit to prevent retrieving enumerable properties not available on OS_DATA Array
  • Loading branch information
Loris Mancel committed Feb 14, 2019
1 parent 1d6c61a commit 9f695b9
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions src/components/browser/browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,29 +101,29 @@ export const getOsData = function() {
let userAgent = Browser.userAgent.toLowerCase()

// Check browser type
for (let i in OS_DATA) {
let osRegExp = new RegExp(OS_DATA[i].identifier.toLowerCase())
for (let os of OS_DATA) {
let osRegExp = new RegExp(os.identifier.toLowerCase())
let osRegExpResult = osRegExp.exec(userAgent)

if (osRegExpResult != null) {
osObject.name = OS_DATA[i].name
osObject.group = OS_DATA[i].group
osObject.name = os.name
osObject.group = os.group

// Version defined
if (OS_DATA[i].version) {
setOsVersion(OS_DATA[i].version, (OS_DATA[i].versionSeparator) ? OS_DATA[i].versionSeparator : '.', osObject)
if (os.version) {
setOsVersion(os.version, (os.versionSeparator) ? os.versionSeparator : '.', osObject)

// Version detected
} else if (osRegExpResult[1]) {
setOsVersion(osRegExpResult[1], (OS_DATA[i].versionSeparator) ? OS_DATA[i].versionSeparator : '.', osObject)
setOsVersion(osRegExpResult[1], (os.versionSeparator) ? os.versionSeparator : '.', osObject)

// Version identifier
} else if (OS_DATA[i].versionIdentifier) {
let versionRegExp = new RegExp(OS_DATA[i].versionIdentifier.toLowerCase())
} else if (os.versionIdentifier) {
let versionRegExp = new RegExp(os.versionIdentifier.toLowerCase())
let versionRegExpResult = versionRegExp.exec(userAgent)

if (versionRegExpResult != null && versionRegExpResult[1])
setOsVersion(versionRegExpResult[1], (OS_DATA[i].versionSeparator) ? OS_DATA[i].versionSeparator : '.', osObject)
setOsVersion(versionRegExpResult[1], (os.versionSeparator) ? os.versionSeparator : '.', osObject)

}
break
Expand Down

0 comments on commit 9f695b9

Please sign in to comment.