Merge pull request phaserjs#810 from jflowers45/dev

photonstorm · photonstorm · commit cd4200a902d3 · 2014-05-08T09:22:01.000+01:00
Update Silk UA test to avoid Safari conflict
diff --git a/src/system/Device.js b/src/system/Device.js
@@ -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'])
         {

Original file line number	Diff line number	Diff line change
`@@ -588,10 +588,6 @@ Phaser.Device.prototype = {`
`588`	`588`	`{`
`589`	`589`	`this.safari = true;`
`590`	`590`	`}`
`591`		`- else if (/Silk/.test(ua))`
`592`		`- {`
`593`		`- this.silk = true;`
`594`		`- }`
`595`	`591`	`else if (/Trident\/(\d+\.\d+)(.*)rv:(\d+\.\d+)/.test(ua))`
`596`	`592`	`{`
`597`	`593`	`this.ie = true;`
`@@ -600,6 +596,12 @@ Phaser.Device.prototype = {`
`600`	`596`	`this.ieVersion = parseInt(RegExp.$3, 10);`
`601`	`597`	`}`
`602`	`598`
	`599`	`+ //Silk gets its own if clause because its ua also contains 'Safari'`
	`600`	`+ if (/Silk/.test(ua))`
	`601`	`+ {`
	`602`	`+ this.silk = true;`
	`603`	`+ }`
	`604`	`+`
`603`	`605`	`// WebApp mode in iOS`
`604`	`606`	`if (navigator['standalone'])`
`605`	`607`	`{`