use major browser version in CHROME constant (#946)

This commit is contained in:
tophf 2020-05-31 08:43:56 +03:00 committed by GitHub
parent a8fe66550b
commit a7a9ee7205
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 11 deletions

View File

@ -217,7 +217,7 @@ function createContextMenus(ids) {
if (chrome.contextMenus) { if (chrome.contextMenus) {
// circumvent the bug with disabling check marks in Chrome 62-64 // circumvent the bug with disabling check marks in Chrome 62-64
const toggleCheckmark = CHROME >= 3172 && CHROME <= 3288 ? const toggleCheckmark = CHROME >= 62 && CHROME <= 64 ?
(id => chrome.contextMenus.remove(id, () => createContextMenus([id]) + ignoreChromeError())) : (id => chrome.contextMenus.remove(id, () => createContextMenus([id]) + ignoreChromeError())) :
((id, checked) => chrome.contextMenus.update(id, {checked}, ignoreChromeError)); ((id, checked) => chrome.contextMenus.update(id, {checked}, ignoreChromeError));

View File

@ -3,7 +3,7 @@
'use strict'; 'use strict';
const iconManager = (() => { const iconManager = (() => {
const ICON_SIZES = FIREFOX || CHROME >= 2883 && !VIVALDI ? [16, 32] : [19, 38]; const ICON_SIZES = FIREFOX || CHROME >= 55 && !VIVALDI ? [16, 32] : [19, 38];
const staleBadges = new Set(); const staleBadges = new Set();
prefs.subscribe([ prefs.subscribe([

View File

@ -4,15 +4,13 @@
/* global promisify */ /* global promisify */
'use strict'; 'use strict';
const CHROME = Boolean(chrome.app) && parseInt(navigator.userAgent.match(/Chrom\w+\/(?:\d+\.){2}(\d+)|$/)[1]); const CHROME = Boolean(chrome.app) && parseInt(navigator.userAgent.match(/Chrom\w+\/(\d+)|$/)[1]);
const OPERA = Boolean(chrome.app) && parseFloat(navigator.userAgent.match(/\bOPR\/(\d+\.\d+)|$/)[1]); const OPERA = Boolean(chrome.app) && parseFloat(navigator.userAgent.match(/\bOPR\/(\d+\.\d+)|$/)[1]);
const VIVALDI = Boolean(chrome.app) && navigator.userAgent.includes('Vivaldi'); const VIVALDI = Boolean(chrome.app) && navigator.userAgent.includes('Vivaldi');
// FIXME: who use this?
// const ANDROID = !chrome.windows;
let FIREFOX = !chrome.app && parseFloat(navigator.userAgent.match(/\bFirefox\/(\d+\.\d+)|$/)[1]); let FIREFOX = !chrome.app && parseFloat(navigator.userAgent.match(/\bFirefox\/(\d+\.\d+)|$/)[1]);
// see PR #781 // see PR #781
const CHROME_HAS_BORDER_BUG = CHROME >= 3167 && CHROME <= 3704; const CHROME_HAS_BORDER_BUG = CHROME >= 62 && CHROME <= 74;
if (!CHROME && !chrome.browserAction.openPopup) { if (!CHROME && !chrome.browserAction.openPopup) {
// in FF pre-57 legacy addons can override useragent so we assume the worst // in FF pre-57 legacy addons can override useragent so we assume the worst
@ -62,7 +60,7 @@ const URLS = {
// Chrome 61.0.3161+ doesn't run content scripts on NTP https://crrev.com/2978953002/ // Chrome 61.0.3161+ doesn't run content scripts on NTP https://crrev.com/2978953002/
// TODO: remove when "minimum_chrome_version": "61" or higher // TODO: remove when "minimum_chrome_version": "61" or higher
chromeProtectsNTP: CHROME >= 3161, chromeProtectsNTP: CHROME >= 61,
userstylesOrgJson: 'https://userstyles.org/styles/chrome/', userstylesOrgJson: 'https://userstyles.org/styles/chrome/',

View File

@ -625,7 +625,7 @@ function switchUI({styleOnly} = {}) {
filter: none; filter: none;
opacity: 1; opacity: 1;
} }
`) + (CHROME >= 3004 ? ` `) + (CHROME >= 58 ? `
.newUI .entry { .newUI .entry {
contain: strict; contain: strict;
} }

View File

@ -10,7 +10,7 @@ enforceInputRange($('#popupWidth'));
setTimeout(splitLongTooltips); setTimeout(splitLongTooltips);
// https://github.com/openstyles/stylus/issues/822 // https://github.com/openstyles/stylus/issues/822
if (!FIREFOX && CHROME >= 3809 && CHROME < 4044) { if (!FIREFOX && CHROME >= 76 && CHROME <= 81) {
const dropboxOption = $('option[value="dropbox"]'); const dropboxOption = $('option[value="dropbox"]');
dropboxOption.disabled = true; dropboxOption.disabled = true;
dropboxOption.setAttribute('title', t('hostDisabled')); dropboxOption.setAttribute('title', t('hostDisabled'));
@ -24,7 +24,7 @@ if (CHROME_HAS_BORDER_BUG) {
} }
// collapse #advanced block in Chrome pre-66 (classic chrome://extensions UI) // collapse #advanced block in Chrome pre-66 (classic chrome://extensions UI)
if (!FIREFOX && !OPERA && CHROME < 3343) { if (!FIREFOX && !OPERA && CHROME < 66) {
const block = $('#advanced'); const block = $('#advanced');
$('h1', block).onclick = event => { $('h1', block).onclick = event => {
event.preventDefault(); event.preventDefault();

View File

@ -15,7 +15,7 @@ const ABOUT_BLANK = 'about:blank';
const ENTRY_ID_PREFIX_RAW = 'style-'; const ENTRY_ID_PREFIX_RAW = 'style-';
const ENTRY_ID_PREFIX = '#' + ENTRY_ID_PREFIX_RAW; const ENTRY_ID_PREFIX = '#' + ENTRY_ID_PREFIX_RAW;
if (CHROME >= 3345 && CHROME < 3533) { // Chrome 66-69 adds a gap, https://crbug.com/821143 if (CHROME >= 66 && CHROME <= 69) { // Chrome 66-69 adds a gap, https://crbug.com/821143
document.head.appendChild($create('style', 'html { overflow: overlay }')); document.head.appendChild($create('style', 'html { overflow: overlay }'));
} }