Merge pull request #810 from jflowers45/dev

Update Silk UA test to avoid Safari conflict
This commit is contained in:
Richard Davey 2014-05-08 09:22:01 +01:00
commit cd4200a902

View file

@ -588,10 +588,6 @@ Phaser.Device.prototype = {
{
this.safari = true;
}
else if (/Silk/.test(ua))
{
this.silk = true;
}
else if (/Trident\/(\d+\.\d+)(.*)rv:(\d+\.\d+)/.test(ua))
{
this.ie = true;
@ -600,6 +596,12 @@ Phaser.Device.prototype = {
this.ieVersion = parseInt(RegExp.$3, 10);
}
//Silk gets its own if clause because its ua also contains 'Safari'
if (/Silk/.test(ua))
{
this.silk = true;
}
// WebApp mode in iOS
if (navigator['standalone'])
{