From 5d166ebadb7f0e2a42829fd9f3723eef5893abbe Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Fri, 28 Oct 2016 23:57:44 +0100 Subject: [PATCH] resourceloader: Optimise startup by merging regexes Merge webOS, misc and Google Glass regexes. * Add various test cases for PlayStation. * Add tests for unrelated user agent matching "Glass". Change-Id: Ifb0944d190f230bb36197b22cf3099c187dad091 --- resources/src/startup.js | 6 ++---- tests/qunit/suites/resources/startup.test.js | 6 ++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/resources/src/startup.js b/resources/src/startup.js index d026cb01ab..61d06b64e2 100644 --- a/resources/src/startup.js +++ b/resources/src/startup.js @@ -64,10 +64,8 @@ function isCompatible( str ) { // Hardcoded exceptions for browsers that pass the requirement but we don't want to // support in the modern run-time. && !( - ua.match( /webOS\/1\.[0-4]/ ) || - ua.match( /PlayStation/i ) || - ua.match( /SymbianOS|Series60|NetFront|Opera Mini|S40OviBrowser|MeeGo/ ) || - ( ua.match( /Glass/ ) && ua.match( /Android/ ) ) + ua.match( /webOS\/1\.[0-4]|SymbianOS|Series60|NetFront|Opera Mini|S40OviBrowser|MeeGo|Android.+Glass/ ) || + ua.match( /PlayStation/i ) ) ); } diff --git a/tests/qunit/suites/resources/startup.test.js b/tests/qunit/suites/resources/startup.test.js index 2934b39f3c..2d996ae7c6 100644 --- a/tests/qunit/suites/resources/startup.test.js +++ b/tests/qunit/suites/resources/startup.test.js @@ -99,12 +99,18 @@ 'Wget/1.10.1 (Red Hat modified)', // Unknown 'I\'m an unknown browser', + 'I\'m an unknown Glass browser', // Empty '' ], blacklisted: [ /* Grade C */ + // PlayStation + 'Mozilla/5.0 (PLAYSTATION 3; 1.10)', + 'Mozilla/5.0 (PLAYSTATION 3; 3.55)', + 'Mozilla/5.0 (PLAYSTATION 3 4.21) AppleWebKit/531.22.8 (KHTML, like Gecko)', + 'Mozilla/5.0 (PlayStation 4 1.70) AppleWebKit/536.26 (KHTML, like Gecko)', // Open WebOS < 1.5 (Palm Pre, Palm Pixi) 'Mozilla/5.0 (webOS/1.0; U; en-US) AppleWebKit/525.27.1 (KHTML, like Gecko) Version/1.0 Safari/525.27.1 Pre/1.0', 'Mozilla/5.0 (webOS/1.4.0; U; en-US) AppleWebKit/532.2 (KHTML, like Gecko) Version/1.0 Safari/532.2 Pixi/1.1 ', -- 2.20.1