Merge pull request phaserjs#1091 from photonstorm/alvin/dev

photonstorm · photonstorm · commit 15378e1d09d7 · 2014-08-06T16:12:33.000+01:00
Fixed phaserjs#1078 chromeOS no belongs to desktops
diff --git a/src/system/Device.js b/src/system/Device.js
@@ -434,7 +434,7 @@ Phaser.Device.prototype = {
             }
         }
 
-        if (this.windows || this.macOS || (this.linux && this.silk === false))
+        if (this.windows || this.macOS || (this.linux && this.silk === false) || this.chromeOS)
         {
             this.desktop = true;
         }

Original file line number	Diff line number	Diff line change
`@@ -434,7 +434,7 @@ Phaser.Device.prototype = {`
`434`	`434`	`}`
`435`	`435`	`}`
`436`	`436`
`437`		`- if (this.windows \|\| this.macOS \|\| (this.linux && this.silk === false))`
	`437`	`+ if (this.windows \|\| this.macOS \|\| (this.linux && this.silk === false) \|\| this.chromeOS)`
`438`	`438`	`{`
`439`	`439`	`this.desktop = true;`
`440`	`440`	`}`