From: Baha Man Date: Wed, 6 May 2015 17:30:18 +0000 (-0400) Subject: Blacklist MeeGo's browser X-Git-Tag: 1.31.0-rc.0~11478^2 X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=8e1d4e3ec514b72fdf44b59c8fd90d0c5c33f6ab;p=lhc%2Fweb%2Fwiklou.git Blacklist MeeGo's browser Bug: T97546 Change-Id: I5347a3598840d55daf32f49fb547c4d89c5d94b5 --- diff --git a/resources/src/startup.js b/resources/src/startup.js index a62cc9d664..80cc7d935a 100644 --- a/resources/src/startup.js +++ b/resources/src/startup.js @@ -52,6 +52,8 @@ function isCompatible( ua ) { ua.match( /Opera Mini/ ) || // Nokia's Ovi Browser ua.match( /S40OviBrowser/ ) || + // MeeGo's browser + ua.match( /MeeGo/ ) || // Google Glass browser groks JS but UI is too limited ( ua.match( /Glass/ ) && ua.match( /Android/ ) ) ); diff --git a/tests/qunit/suites/resources/startup.test.js b/tests/qunit/suites/resources/startup.test.js index 6011961ac5..5ea7a81635 100644 --- a/tests/qunit/suites/resources/startup.test.js +++ b/tests/qunit/suites/resources/startup.test.js @@ -86,7 +86,9 @@ 'Mozilla/5.0 (Series40; NokiaX3-02/05.60; Profile/MIDP-2.1 Configuration/CLDC-1.1) Gecko/20100401 S40OviBrowser/3.2.0.0.6', 'Mozilla/5.0 (Series40; Nokia305/05.92; Profile/MIDP-2.1 Configuration/CLDC-1.1) Gecko/20100401 S40OviBrowser/3.7.0.0.11', // Google Glass - 'Mozilla/5.0 (Linux; U; Android 4.0.4; en-us; Glass 1 Build/IMM76L; XE11) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30' + 'Mozilla/5.0 (Linux; U; Android 4.0.4; en-us; Glass 1 Build/IMM76L; XE11) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30', + // MeeGo + 'Mozilla/5.0 (MeeGo; NokiaN9) AppleWebKit/534.13 (KHTML, like Gecko) NokiaBrowser/8.5.0 Mobile Safari/534.13' ], // No explicit support for or against these browsers, they're given a shot at Grade A. gradeX: [