Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

code review for https://github.com/gorhill/uBlock/commit/0322d03303cd -- fix handling of rc versions

This commit is contained in:
Raymond Hill 2018-09-11 08:42:02 -04:00
parent 0322d03303
commit b5ef2d0105
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/js/start.js
View File

@ -144,7 +144,7 @@ var onVersionReady = function(lastVersion) {
} else if ( pstr.startsWith('.') || pstr.startsWith('b') ) { } else if ( pstr.startsWith('.') || pstr.startsWith('b') ) {
pint = parseInt(pstr.slice(1), 10); pint = parseInt(pstr.slice(1), 10);
} else if ( pstr.startsWith('rc') ) { } else if ( pstr.startsWith('rc') ) {
pint = parseInt(pstr.slice(2), 10) * 100; pint = parseInt(pstr.slice(2), 10) + 100;
} else { } else {
pint = parseInt(pstr, 10); pint = parseInt(pstr, 10);
} }
@ -153,14 +153,16 @@ var onVersionReady = function(lastVersion) {
return vint; return vint;
}; };
if ( intFromVersion(lastVersion) <= 1016021007 ) { let lastVersionInt = intFromVersion(lastVersion);
if ( lastVersionInt <= 1016021007 ) {
µb.sessionSwitches.toggle('no-scripting', 'behind-the-scene', 2); µb.sessionSwitches.toggle('no-scripting', 'behind-the-scene', 2);
µb.permanentSwitches.toggle('no-scripting', 'behind-the-scene', 2); µb.permanentSwitches.toggle('no-scripting', 'behind-the-scene', 2);
µb.saveHostnameSwitches(); µb.saveHostnameSwitches();
} }
// https://github.com/uBlockOrigin/uBlock-issues/issues/212#issuecomment-419741324 // https://github.com/uBlockOrigin/uBlock-issues/issues/212#issuecomment-419741324
if ( intFromVersion(lastVersion) <= 1015024000 ) { if ( lastVersionInt <= 1015024000 ) {
if ( µb.hiddenSettings.manualUpdateAssetFetchPeriod === 2000 ) { if ( µb.hiddenSettings.manualUpdateAssetFetchPeriod === 2000 ) {
µb.hiddenSettings.manualUpdateAssetFetchPeriod = 500; µb.hiddenSettings.manualUpdateAssetFetchPeriod = 500;
µb.saveHiddenSettings(); µb.saveHiddenSettings();