Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "resourceloader: Optimise startup by merging regexes"

Browse source
This commit is contained in:
jenkins-bot 2016-11-03 00:29:58 +00:00 committed by Gerrit Code Review
commit f40e4c6b36
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
resources/src/startup.js
View file

@ -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 )
)
);
}

6
tests/qunit/suites/resources/startup.test.js
View file

@ -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 ',