Skip to content

Commit

Permalink
[workflow] Update uBOLite MV3 package files for uBOLite_2024.12.10.932
Browse files Browse the repository at this point in the history
Files changed:
M	chromium/_locales/ar/messages.json
M	chromium/_locales/fy/messages.json
M	chromium/_locales/nl/messages.json
M	chromium/css/settings.css
M	chromium/dashboard.html
M	chromium/js/background.js
M	chromium/js/mode-manager.js
M	chromium/js/settings.js
M	chromium/log.txt
M	chromium/manifest.json
M	chromium/rulesets/main/annoyances-cookies.json
M	chromium/rulesets/main/annoyances-others.json
M	chromium/rulesets/main/chn-0.json
M	chromium/rulesets/main/default.json
M	chromium/rulesets/main/ind-0.json
M	chromium/rulesets/main/jpn-1.json
D	chromium/rulesets/main/nrd.30day.phishing.json
M	chromium/rulesets/main/swe-1.json
A	chromium/rulesets/main/urlhaus.full.json
M	chromium/rulesets/main/vie-1.json
M	chromium/rulesets/modify-headers/vie-1.json
M	chromium/rulesets/regex/default.json
M	chromium/rulesets/ruleset-details.json
M	chromium/rulesets/scripting/declarative/annoyances-cookies.js
M	chromium/rulesets/scripting/declarative/jpn-1.js
M	chromium/rulesets/scripting/declarative/rus-0.js
M	chromium/rulesets/scripting/generic/annoyances-cookies.js
M	chromium/rulesets/scripting/generichigh/annoyances-cookies.css
M	chromium/rulesets/scripting/procedural/annoyances-cookies.js
M	chromium/rulesets/scripting/procedural/default.js
M	chromium/rulesets/scripting/procedural/ind-0.js
M	chromium/rulesets/scripting/procedural/jpn-1.js
M	chromium/rulesets/scripting/procedural/rus-0.js
M	chromium/rulesets/scripting/procedural/swe-1.js
M	chromium/rulesets/scripting/scriptlet/annoyances-cookies.remove-class.js
M	chromium/rulesets/scripting/scriptlet/annoyances-cookies.set-cookie.js
M	chromium/rulesets/scripting/scriptlet/annoyances-cookies.trusted-set-cookie.js
M	chromium/rulesets/scripting/scriptlet/default.abort-on-stack-trace.js
M	chromium/rulesets/scripting/scriptlet/default.prevent-fetch.js
M	chromium/rulesets/scripting/scriptlet/default.prevent-setTimeout.js
M	chromium/rulesets/scripting/scriptlet/default.remove-attr.js
M	chromium/rulesets/scripting/scriptlet/default.remove-node-text.js
M	chromium/rulesets/scripting/scriptlet/default.set-constant.js
M	chromium/rulesets/scripting/scriptlet/jpn-1.abort-current-script.js
M	chromium/rulesets/scripting/scriptlet/jpn-1.prevent-setTimeout.js
M	chromium/rulesets/scripting/scriptlet/jpn-1.spoof-css.js
M	chromium/rulesets/scripting/scriptlet/vie-1.addEventListener-defuser.js
M	chromium/rulesets/scripting/scriptlet/vie-1.set-constant.js
M	chromium/rulesets/scripting/specific/annoyances-cookies.js
M	chromium/rulesets/scripting/specific/annoyances-others.js
M	chromium/rulesets/scripting/specific/annoyances-overlays.js
M	chromium/rulesets/scripting/specific/annoyances-social.js
M	chromium/rulesets/scripting/specific/chn-0.js
M	chromium/rulesets/scripting/specific/default.js
M	chromium/rulesets/scripting/specific/hun-0.js
M	chromium/rulesets/scripting/specific/ind-0.js
M	chromium/rulesets/scripting/specific/jpn-1.js
M	chromium/rulesets/scripting/specific/rus-0.js
M	chromium/rulesets/scripting/specific/spa-1.js
M	chromium/rulesets/scripting/specific/swe-1.js
M	chromium/rulesets/scripting/specific/tur-0.js
M	chromium/rulesets/scripting/specific/vie-1.js
M	chromium/rulesets/scriptlet-details.json
M	chromium/rulesets/strictblock/chn-0.json
M	chromium/rulesets/strictblock/default.json
M	chromium/rulesets/strictblock/jpn-1.json
D	chromium/rulesets/strictblock/nrd.30day.phishing.json
A	chromium/rulesets/strictblock/urlhaus.full.json
M	chromium/rulesets/strictblock/vie-1.json
R100	chromium/strictblock.7c2f5ba629ec7543.html	chromium/strictblock.949d0b6b31c24176.html
  • Loading branch information
gorhill committed Dec 10, 2024
1 parent d8927fb commit b674437
Show file tree
Hide file tree
Showing 70 changed files with 66,652 additions and 17,951 deletions.
2 changes: 1 addition & 1 deletion chromium/_locales/ar/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@
"description": "Text informing about what is causing the page to be blocked"
},
"strictblockRedirectSentence1": {
"message": "The blocked page wants to redirect to another site. If you choose to proceed, you will navigate directly to: {{url}}",
"message": "الصفحة المحظورة تريد إعادة التوجيه إلى موقع آخر. إذا اخترت المتابعة، فسوف تنتقل مباشرة إلى: {{url}}",
"description": "Text warning about an incoming redirect"
},
"strictblockNoParamsPrompt": {
Expand Down
12 changes: 6 additions & 6 deletions chromium/_locales/fy/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -232,11 +232,11 @@
"description": "Label for a checkbox in the options page"
},
"enableStrictBlockLabel": {
"message": "Strikte blokkearring ynskeakelje",
"message": "Strange blokkearring ynskeakelje",
"description": "Label for a checkbox in the options page"
},
"enableStrictBlockLegend": {
"message": "Navigaasje nei in potinsjeel net-winske websites sil blokkearre wurde, en jo krije in opsje om troch te gean.",
"message": "Navigaasje nei potinsjeel net-winske websites wurdt blokkearre, en jo krije de opsje om troch te gean.",
"description": "Label for a checkbox in the options page"
},
"findListsPlaceholder": {
Expand All @@ -248,15 +248,15 @@
"description": "Webpage title for the strict-blocked page"
},
"strictblockSentence1": {
"message": "uBO Lite hat opkeard dat de folgjende side laden wurd:",
"message": "uBO Lite hat it laden fan de folgjende side opkeard:",
"description": "Sentence used in the strict-blocked page"
},
"strictblockReasonSentence1": {
"message": "The page was blocked because of a matching filter in {{listname}}.",
"message": "De side is blokkearre fanwegen in oerienkommend filter yn {{listname}}.",
"description": "Text informing about what is causing the page to be blocked"
},
"strictblockRedirectSentence1": {
"message": "The blocked page wants to redirect to another site. If you choose to proceed, you will navigate directly to: {{url}}",
"message": "De blokkearre side wol jo omliede nei in oare website. As jo trochgean, navigearje jo streekrjocht nei: {{url}}",
"description": "Text warning about an incoming redirect"
},
"strictblockNoParamsPrompt": {
Expand All @@ -268,7 +268,7 @@
"description": "A button to go back to the previous webpage"
},
"strictblockClose": {
"message": "Slút dit finster",
"message": "Dit finster slute",
"description": "A button to close the current tab"
},
"strictblockDontWarn": {
Expand Down
2 changes: 1 addition & 1 deletion chromium/_locales/nl/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@
"description": "Label for a checkbox in the options page"
},
"enableStrictBlockLegend": {
"message": "Navigatie naar mogelijk ongewenste websites wordt geblokkeerd, en nu krijgt de mogelijkheid om door te gaan.",
"message": "Navigatie naar mogelijk ongewenste websites wordt geblokkeerd, en u krijgt de mogelijkheid om door te gaan.",
"description": "Label for a checkbox in the options page"
},
"findListsPlaceholder": {
Expand Down
11 changes: 9 additions & 2 deletions chromium/css/settings.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ body.firstRun .firstRun {
display: block;
padding: 8px;
}
body .firstRun > *:first-child {
margin-top: 0;
}
body .firstRun > *:last-child {
margin-bottom: 0;
}
h3 {
margin: 1em 0;
}
Expand All @@ -30,8 +36,9 @@ body[data-forbid~="filteringMode"] section[data-pane="settings"] > div:has(> h3[
display: none;
}

#showBlockedCount:has(input[type="checkbox"][disabled]) {
opacity: 0.5;
label:has(input[type="checkbox"][disabled]),
label:has(input[type="checkbox"][disabled]) + legend {
filter: var(--checkbox-disabled-filter);
}

#defaultFilteringMode {
Expand Down
4 changes: 2 additions & 2 deletions chromium/dashboard.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ <h3 data-i18n="behaviorSectionLabel"></h3>
<p><label id="autoReload" data-i18n="autoReloadLabel"><span class="input checkbox"><input type="checkbox"><svg viewBox="0 0 24 24"><path d="M1.73,12.91 8.1,19.28 22.79,4.59"/></svg></span>_</label>
</p>
<p><label id="showBlockedCount" data-i18n="showBlockedCountLabel"><span class="input checkbox"><input type="checkbox"><svg viewBox="0 0 24 24"><path d="M1.73,12.91 8.1,19.28 22.79,4.59"/></svg></span>_</label>
<p><label id="strictBlockMode" data-i18n="enableStrictBlockLabel"><span class="input checkbox"><input type="checkbox"><svg viewBox="0 0 24 24"><path d="M1.73,12.91 8.1,19.28 22.79,4.59"/></svg></span>_</label><legend data-i18n="enableStrictBlockLegend"></legend>
<p id="developerMode" hidden><label><span class="input checkbox"><input type="checkbox"><svg viewBox="0 0 24 24"><path d="M1.73,12.91 8.1,19.28 22.79,4.59"/></svg></span>Developer mode</label>
</div>

<div class="firstRun">
Expand Down Expand Up @@ -90,6 +88,8 @@ <h3 data-i18n="defaultFilteringModeSectionLabel"></h3>
<div data-i18n="completeFilteringModeDescription"></div>
</label>
</div>
<p><label id="strictBlockMode" data-i18n="enableStrictBlockLabel"><span class="input checkbox"><input type="checkbox"><svg viewBox="0 0 24 24"><path d="M1.73,12.91 8.1,19.28 22.79,4.59"/></svg></span>_</label><legend data-i18n="enableStrictBlockLegend"></legend>
<p id="developerMode" hidden><label><span class="input checkbox"><input type="checkbox"><svg viewBox="0 0 24 24"><path d="M1.73,12.91 8.1,19.28 22.79,4.59"/></svg></span>Developer mode</label>
</div>

<div>
Expand Down
18 changes: 12 additions & 6 deletions chromium/js/background.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,11 @@ async function hasGreatPowers(origin) {
});
}

function hasOmnipotence() {
async function hasOmnipotence() {
const manifest = runtime.getManifest();
const hasOmnipotence = Array.isArray(manifest.host_permissions) &&
manifest.host_permissions.includes('<all_urls>');
if ( hasOmnipotence ) { return true; }
return browser.permissions.contains({
origins: [ '<all_urls>' ],
});
Expand Down Expand Up @@ -436,13 +440,15 @@ async function start() {
if ( afterLevel === MODE_OPTIMAL ) {
updateDynamicRules();
registerInjectables();
process.firstRun = false;
}
}
const disableFirstRunPage = await adminRead('disableFirstRunPage');
if ( disableFirstRunPage !== true ) {
runtime.openOptionsPage();
} else {
process.firstRun = false;
const disableFirstRunPage = await adminRead('disableFirstRunPage');
if ( disableFirstRunPage !== true ) {
runtime.openOptionsPage();
} else {
process.firstRun = false;
}
}
}

Expand Down
5 changes: 3 additions & 2 deletions chromium/js/mode-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -252,10 +252,11 @@ async function writeFilteringModeDetails(afterDetails) {
localWrite('filteringModeDetails', data);
sessionWrite('filteringModeDetails', data);
readFilteringModeDetails.cache = unserializeModeDetails(data);

Promise.all([
return Promise.all([
getDefaultFilteringMode(),
getTrustedSites(),
localWrite('filteringModeDetails', data),
sessionWrite('filteringModeDetails', data),
]).then(results => {
broadcastMessage({
defaultFilteringMode: results[0],
Expand Down
7 changes: 6 additions & 1 deletion chromium/js/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,12 @@ function renderWidgets() {
}
}

qs$('#strictBlockMode input[type="checkbox"]').checked = cachedRulesetData.strictBlockMode;
{
const input = qs$('#strictBlockMode input[type="checkbox"]');
const canStrictBlock = cachedRulesetData.defaultFilteringMode > 1;
input.checked = canStrictBlock && cachedRulesetData.strictBlockMode;
dom.attr(input, 'disabled', canStrictBlock ? null : '');
}

{
dom.prop('#developerMode input[type="checkbox"]', 'checked',
Expand Down
Loading

0 comments on commit b674437

Please sign in to comment.