Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-07-08 12:57:57 +02:00
Code Issues Releases Wiki Activity

Add Chromium detection for Chromium-based MS Edge

Browse Source 
Related issue:
- https://github.com/uBlockOrigin/uBlock-issues/issues/1174
This commit is contained in:
Raymond Hill 2020-07-24 12:32:47 -04:00
parent 5c68867b92
commit 39190ff469
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
platform/chromium/vapi-common.js
View File

@ -75,8 +75,7 @@ vAPI.webextFlavor = {
dispatch();
});
if ( browser.runtime.getURL('').startsWith('moz-extension://') ) {
soup.add('mozilla')
.add('firefox')
soup.add('firefox')
.add('user_stylesheet')
.add('html_filtering');
flavor.major = 60;
@ -85,29 +84,14 @@ vAPI.webextFlavor = {
}
// Synchronous -- order of tests is important
let match;
if ( (match = /\bEdge\/(\d+)/.exec(ua)) !== null ) {
flavor.major = parseInt(match[1], 10) || 0;
soup.add('microsoft').add('edge');
} else if ( (match = /\bOPR\/(\d+)/.exec(ua)) !== null ) {
const reEx = /\bChrom(?:e|ium)\/([\d.]+)/;
if ( reEx.test(ua) ) { match = reEx.exec(ua); }
flavor.major = parseInt(match[1], 10) || 0;
soup.add('opera').add('chromium');
} else if ( (match = /\bChromium\/(\d+)/.exec(ua)) !== null ) {
flavor.major = parseInt(match[1], 10) || 0;
const match = /\bChrom(?:e|ium)\/([\d.]+)/.exec(ua);
if ( match !== null ) {
soup.add('chromium');
} else if ( (match = /\bChrome\/(\d+)/.exec(ua)) !== null ) {
flavor.major = parseInt(match[1], 10) || 0;
soup.add('google').add('chromium');
} else if ( (match = /\bSafari\/(\d+)/.exec(ua)) !== null ) {
flavor.major = parseInt(match[1], 10) || 0;
soup.add('apple').add('safari');
}
// https://github.com/gorhill/uBlock/issues/3588
if ( soup.has('chromium') && flavor.major >= 66 ) {
soup.add('user_stylesheet');
// https://github.com/gorhill/uBlock/issues/3588
if ( flavor.major >= 66 ) {
soup.add('user_stylesheet');
}
}
// Don't starve potential listeners