Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-24 13:43:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3734 from AleBles/master

Browse source 
Fixed device.os incorrectly reporting Linux as os on Android devices
This commit is contained in:
Richard Davey 2018-06-11 08:27:09 +01:00 committed by GitHub
commit bf3e490967
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/device/OS.js
View file

@ -9,10 +9,10 @@
* These values are read-only and populated during the boot sequence of the game.
* They are then referenced by internal game systems and are available for you to access
* via `this.sys.game.device.os` from within any Scene.
*
*
* @typedef {object} Phaser.Device.OS
* @since 3.0.0
*
*
* @property {boolean} android - Is running on android?
* @property {boolean} chromeOS - Is running on chromeOS?
* @property {boolean} cocoonJS - Is the game running under CocoonJS?
@ -75,14 +75,14 @@ function init ()
{
OS.macOS = true;
}
else if (/Linux/.test(ua))
{
OS.linux = true;
}
else if (/Android/.test(ua))
{
OS.android = true;
}
else if (/Linux/.test(ua))
{
OS.linux = true;
}
else if (/iP[ao]d|iPhone/i.test(ua))
{
OS.iOS = true;
@ -128,24 +128,24 @@ function init ()
{
OS.webApp = true;
}
if (window.cordova !== undefined)
{
OS.cordova = true;
}
if (process && process.versions && process.versions.node)
{
OS.node = true;
}
if (OS.node && typeof process.versions === 'object')
{
OS.nodeWebkit = !!process.versions['node-webkit'];
OS.electron = !!process.versions.electron;
}
if (navigator.isCocoonJS)
{
OS.cocoonJS = true;