Remove support deprecated "classic" popup panel

This will prevent spurious issues being opened about long
deprecated "classic" popup panel:

Related commit:
- b4911e2d7c
This commit is contained in:
Raymond Hill 2022-05-08 10:58:15 -04:00
parent bd1e82418b
commit cef36518ed
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
5 changed files with 0 additions and 1917 deletions

View File

@ -1,545 +0,0 @@
:root {
--bg-tooltip: hsla(60, 100%, 97%, 1);
--popup-power-ink: rgb(0 110 254);
--popup-power-ink-hover: rgb(var(--blue-60));
--ink-2: rgb(var(--ink-rgb) / 80%);
--ink-3: rgb(var(--ink-rgb) / 60%);
--ink-4: rgb(var(--ink-rgb) / 40%);
--ink-5: rgb(var(--ink-rgb) / 20%);
}
:root.dark {
--popup-power-ink-hover: rgb(var(--blue-30));
}
body {
display: flex;
flex-direction: column;
overflow: hidden;
white-space: nowrap;
width: fit-content;
width: -moz-fit-content;
}
h2 {
background-color: var(--surface-2);
border: 0;
color: var(--ink-3);
cursor: pointer;
font-size: 100%;
font-weight: normal;
padding: 0.2em;
text-align: center;
}
a {
color: inherit;
text-decoration: none;
}
:focus {
outline: 0;
}
#appinfo {
align-items: flex-end;
background-color: #444;
border: 0;
color: #bbb;
display: flex;
font-size: smaller;
justify-content: center;
margin: 0;
padding: 1px 0;
width: 100%;
}
#panes {
display: flex;
flex-direction: row-reverse;
}
#panes > div {
display: inline-block;
position: relative;
vertical-align: top;
}
body[dir="ltr"] #panes > div {
direction: ltr;
}
body[dir="rtl"] #panes > div {
direction: rtl;
}
#panes > div:nth-of-type(2) {
flex-shrink: 0;
font-family: "Noto Sans", sans-serif;
overflow-y: auto;
overflow-x: hidden;
width: 24em;
}
/**
Scroll bar to the left.
*/
body[dir="ltr"] #panes > div:nth-of-type(2) {
direction: rtl;
margin-right: 1px;
}
body[dir="rtl"] #panes > div:nth-of-type(2) {
direction: ltr;
margin-left: 1px;
}
#panes:not(.dfEnabled) > div:nth-of-type(2) {
display: none;
}
#panes > div:first-of-type {
min-width: 11em;
padding: 0;
}
p {
display: flex;
justify-content: center;
}
.fa-icon {
font-size: 120%;
}
.fa {
font-size: 120%;
}
#switch {
margin: 0.8em 0;
}
#switch .fa-icon {
color: var(--popup-power-ink);
fill: var(--popup-power-ink);
cursor: pointer;
font-size: 700%;
margin: 0;
padding: 0;
}
#switch .fa-icon:hover {
color: var(--popup-power-ink-hover);
fill: var(--popup-power-ink-hover);
}
body.off #switch .fa-icon {
color: var(--ink-5);
fill: var(--ink-5);
}
#basicTools {
margin: 1.2em 0 0.5em 0;
}
.tool:first-child {
margin-left: 0;
}
.tool {
color: var(--ink-4);
fill: var(--ink-4);
cursor: pointer;
margin-left: 0.8em;
min-width: 1em;
padding: 0 0.2em;
unicode-bidi: embed;
visibility: hidden;
}
.tool.enabled {
visibility: visible;
}
.tool.enabled:hover {
color: inherit;
fill: inherit;
}
#page-blocked {
font-size: 1.25em;
}
.statName {
color: var(--ink-3);
font-size: 85%;
margin: 0.8em 0.2em 0.4em 0.2em;
}
.statValue {
margin: 0;
}
#extraTools {
background-color: var(--surface-2);
border: 0;
display: flex;
justify-content: center;
margin: 0.8em 0 0 0;
padding: 0.2em 0;
}
body.responsive #extraTools {
justify-content: space-evenly;
}
#extraTools > span {
color: var(--ink-4);
fill: var(--ink-4);
cursor: pointer;
font-size: 1.2em;
margin: 0 0.8em 0 0;
position: relative;
}
#extraTools > span:first-of-type {
margin-left: 0.9em;
}
#extraTools > span > .nope {
left: 50%;
position: absolute;
stroke: var(--popup-icon-x-ink);
stroke-width: 2;
transform: translateX(-50%);
visibility: hidden;
width: 1em;
}
#extraTools > span.on > .nope {
visibility: visible;
}
#extraTools > span:hover {
color: inherit;
fill: inherit;
}
#refresh {
background-color: var(--notice-surface);
border: 1px solid #ddc;
border-radius: 4px;
cursor: pointer;
display: none;
fill: var(--ink-3);
font-size: 3em;
justify-content: center;
left: 4px;
line-height: 1;
padding: 0.15em;
position: absolute;
right: 4px;
}
body.dirty #refresh {
display: flex;
}
body.dirty #refresh:hover {
fill: inherit;
}
#tooltip {
background-color: var(--bg-tooltip);
border: 1px solid gray;
border-radius: 3px;
box-shadow: 1px 1px 3px gray;
box-sizing: border-box;
color: var(--ink-1);
cursor: pointer;
direction: ltr;
font: 12px sans-serif;
left: 5%;
line-height: 130%;
margin: 0.5em 0;
opacity: 0;
padding: 4px 6px;
pointer-events: none;
position: absolute;
text-align: center;
visibility: hidden;
white-space: pre-line;
width: 90%;
z-index: 100;
}
body[dir="rtl"] #tooltip {
direction: rtl;
}
#tooltip.show {
transition: opacity 0.15s 0.5s;
-webkit-transition: opacity 0.15s 0.5s;
visibility: visible;
opacity: 1;
}
#firewallContainer {
border: 0;
font-size: 85%;
line-height: 1.4;
margin: 0;
padding: 0;
text-align: right;
}
#firewallContainer > div {
border: 0;
direction: ltr;
display: flex;
justify-content: flex-end;
margin: 0;
margin-top: 1px;
padding: 0;
}
#firewallContainer > div:first-child {
margin-top: 0;
}
#firewallContainer > div:first-child ~ div[data-des="*"] {
display: none;
}
#firewallContainer:not(.expanded) > div.isSubDomain:not(.expandException):not(.isRootContext),
#firewallContainer.expanded > div.isSubDomain.expandException:not(.isRootContext) {
display: none;
}
#firewallContainer > div > span {
background-color: var(--surface-2);
border: none;
box-sizing: border-box;
display: inline-flex;
flex-shrink: 0;
padding: 0.33em 0;
position: relative;
}
#firewallContainer > div:first-of-type > span:first-of-type {
cursor: pointer;
flex-direction: unset;
}
#firewallContainer > div > span:first-of-type {
align-items: flex-end;
flex-direction: column;
justify-content: flex-end;
padding-right: 2px;
white-space: normal;
width: calc(100% - 4em);
word-break: break-word;
}
#firewallContainer > div.isCname > span:first-of-type {
color: var(--popup-cell-cname-ink);
}
#firewallContainer > div > span:first-of-type > sub {
display: inline-block;
font-size: 85%;
font-weight: normal;
padding: 0.25em 0 0 0;
}
#firewallContainer > div > span:first-of-type > sub:empty {
display: none;
}
#firewallContainer > div > span:first-of-type ~ span {
margin-left: 1px;
width: 4em;
}
#firewallContainer > div > span:nth-of-type(2) {
display: none;
}
#firewallContainer > div > span:nth-of-type(3),
#firewallContainer > div > span:nth-of-type(4) {
color: var(--ink-3);
display: none;
font-family: monospace;
text-align: center;
}
#firewallContainer > div.isDomain > span:first-of-type {
font-weight: bold;
}
#firewallContainer > div:first-of-type > span:first-of-type::before {
color: var(--ink-3);
content: '+';
padding-right: 0.25em;
}
#firewallContainer.expanded > div:first-of-type > span:first-of-type::before {
content: '\2012';
}
#firewallContainer > div[data-des="*"] > span:nth-of-type(3),
#firewallContainer > div.isSubDomain > span:nth-of-type(3),
#firewallContainer > div.isSubDomain.isRootContext > span:nth-of-type(3),
#firewallContainer.expanded > div:not(.expandException) > span:nth-of-type(3),
#firewallContainer:not(.expanded) > div.expandException > span:nth-of-type(3),
#firewallContainer:not(.expanded) > div.isDomain:not(.expandException) > span:nth-of-type(4),
#firewallContainer.expanded > div.isDomain.expandException > span:nth-of-type(4) {
display: inline-flex;
justify-content: space-between;
}
#firewallContainer > div > span[data-acount]::before,
#firewallContainer > div > span[data-bcount]::after,
#firewallContainer > div > span[data-acount] > #actionSelector > #dynaCounts::before,
#firewallContainer > div > span[data-acount] > #actionSelector > #dynaCounts::after {
content: ' ';
}
#firewallContainer > div > span[data-acount]::before,
#firewallContainer > div > span[data-acount] > #actionSelector > #dynaCounts::before {
padding-left: 0.1em;
}
#firewallContainer > div > span[data-acount="1"]::before,
#firewallContainer > div > span[data-acount="1"] > #actionSelector > #dynaCounts::before {
content: '+';
}
#firewallContainer > div > span[data-acount="2"]::before,
#firewallContainer > div > span[data-acount="2"] > #actionSelector > #dynaCounts::before {
content: '++';
}
#firewallContainer > div > span[data-acount="3"]::before,
#firewallContainer > div > span[data-acount="3"] > #actionSelector > #dynaCounts::before {
content: '+++';
}
#firewallContainer > div > span[data-bcount]::after,
#firewallContainer > div > span[data-bcount] > #actionSelector > #dynaCounts::after {
padding-right: 0.1em;
}
#firewallContainer > div > span[data-bcount="1"]::after,
#firewallContainer > div > span[data-bcount="1"] > #actionSelector > #dynaCounts::after {
content: '\2212';
}
#firewallContainer > div > span[data-bcount="2"]::after,
#firewallContainer > div > span[data-bcount="2"] > #actionSelector > #dynaCounts::after {
content: '\2212\2212';
}
#firewallContainer > div > span[data-bcount="3"]::after,
#firewallContainer > div > span[data-bcount="3"] > #actionSelector > #dynaCounts::after {
content: '\2212\2212\2212';
}
body.advancedUser #firewallContainer > div > span:first-of-type {
width: calc(100% - 8em);
}
body.advancedUser #firewallContainer > div > span:nth-of-type(2) {
display: inline-flex;
}
body.advancedUser #firewallContainer > div:first-child ~ div[data-des="*"] {
display: flex;
}
body.advancedUser #firewallContainer > div > span:first-of-type ~ span {
cursor: pointer;
}
/**
Small coloured label at the left of a row
*/
#firewallContainer > div.isRootContext > span:first-of-type::before,
#firewallContainer > div.allowed > span:first-of-type::before,
#firewallContainer > div.blocked > span:first-of-type::before,
#firewallContainer:not(.expanded) > div.isDomain.totalAllowed:not(.expandException) > span:first-of-type::before,
#firewallContainer:not(.expanded) > div.isDomain.totalBlocked:not(.expandException) > span:first-of-type::before,
#firewallContainer.expanded > div.isDomain.totalAllowed.expandException > span:first-of-type::before,
#firewallContainer.expanded > div.isDomain.totalBlocked.expandException > span:first-of-type::before {
box-sizing: border-box;
content: '';
display: inline-block;
filter: var(--popup-cell-label-filter);
height: 100%;
left: 0;
position: absolute;
top: 0;
width: 7px;
}
#firewallContainer > div.isRootContext > span:first-of-type::before {
background-color: var(--ink-3);
width: 14px !important;
}
#firewallContainer > div.allowed > span:first-of-type::before,
#firewallContainer > div.isDomain.totalAllowed > span:first-of-type::before {
background-color: var(--popup-cell-allow-own-surface);
}
#firewallContainer > div.blocked > span:first-of-type::before,
#firewallContainer > div.isDomain.totalBlocked > span:first-of-type::before {
background-color: var(--popup-cell-block-own-surface);
}
#firewallContainer > div.allowed.blocked > span:first-of-type::before,
#firewallContainer > div.isDomain.totalAllowed.totalBlocked > span:first-of-type::before {
background-color: var(--popup-cell-label-mixed-surface);
}
/* Rule cells */
body.advancedUser #firewallContainer > div > span.allowRule,
#actionSelector > #dynaAllow {
background-color: var(--popup-cell-allow-surface);
}
body.advancedUser #firewallContainer > div > span.blockRule,
#actionSelector > #dynaBlock {
background-color: var(--popup-cell-block-surface);
}
body.advancedUser #firewallContainer > div > span.noopRule,
#actionSelector > #dynaNoop {
background-color: var(--popup-cell-noop-surface);
}
body.advancedUser #firewallContainer > div > span.ownRule,
#firewallContainer > div > span.ownRule {
color: var(--surface-1);
}
body.advancedUser #firewallContainer > div > span.allowRule.ownRule,
#actionSelector > #dynaAllow:hover {
background-color: var(--popup-cell-allow-own-surface);
}
body.advancedUser #firewallContainer > div > span.blockRule.ownRule,
#actionSelector > #dynaBlock:hover {
background-color: var(--popup-cell-block-own-surface);
}
body.advancedUser #firewallContainer > div > span.noopRule.ownRule,
#actionSelector > #dynaNoop:hover {
background-color: var(--popup-cell-noop-own-surface);
}
#actionSelector {
box-sizing: border-box;
height: 100%;
left: 0;
position: absolute;
top: 0;
width: 100%;
z-index: 1;
}
#actionSelector > span {
display: inline-block;
height: 100%;
}
#actionSelector > #dynaAllow {
width: 33%;
}
#actionSelector > #dynaNoop {
width: 33.5%;
}
#actionSelector > #dynaBlock {
width: 33.5%;
}
#actionSelector > #dynaCounts {
align-items: center;
background-color: transparent;
display: inline-flex;
height: 100%;
justify-content: space-between;
left: 0;
pointer-events: none;
position: absolute;
top: 0;
width: 100%;
}
#rulesetTools {
background-color: transparent;
border: 0;
display: none;
left: 4px;
padding: 0;
position: fixed;
top: 4px;
}
#rulesetTools > span {
background-color: var(--notice-surface);
border: 1px solid #ddc;
border-radius: 4px;
cursor: pointer;
display: inline-block;
fill: var(--ink-3);
font-size: 1.8em;
line-height: 1.0;
margin: 0;
margin-right: 0.1em;
padding: 0.2em 0.4em;
text-align: center;
width: 1em;
}
#firewallContainer.dirty ~ #rulesetTools {
display: block;
}
#firewallContainer.dirty ~ #rulesetTools > span:hover {
fill: inherit;
}
body.responsive {
overflow-y: auto;
width: auto;
}
body.responsive #panes {
flex-wrap: wrap;
}
body.responsive #panes > div:nth-of-type(1) {
flex-shrink: 0;
flex-grow: 1;
}
body.responsive #panes > div:nth-of-type(2) {
flex-grow: 8;
flex-shrink: 1;
width: auto;
}

View File

@ -81,7 +81,6 @@ const hiddenSettingsDefault = {
selfieAfter: 2,
strictBlockingBypassDuration: 120,
uiPopupConfig: 'unset',
uiFlavor: 'unset',
uiStyles: 'unset',
updateAssetBypassBrowserCache: false,
userResourcesLocation: 'unset',

File diff suppressed because it is too large Load Diff

View File

@ -493,16 +493,6 @@ io.addObserver(µb.assetObserver.bind(µb));
// active tab.
contextMenu.update();
// Maybe install non-default popup document, or automatically select
// default UI according to platform.
if (
browser.browserAction instanceof Object &&
browser.browserAction.setPopup instanceof Function &&
µb.hiddenSettings.uiFlavor === 'classic'
) {
browser.browserAction.setPopup({ popup: 'popup.html' });
}
// https://github.com/uBlockOrigin/uBlock-issues/issues/717
// Prevent the extension from being restarted mid-session.
browser.runtime.onUpdateAvailable.addListener(details => {

View File

@ -1,74 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" type="text/css" href="css/themes/default.css">
<link rel="stylesheet" href="css/common.css" type="text/css">
<link rel="stylesheet" href="css/fa-icons.css" type="text/css">
<link rel="stylesheet" href="css/popup.css" type="text/css">
<title data-i18n="extName"></title>
</head>
<body>
<div id="appinfo"><span id="appname">&nbsp;</span>&nbsp;<span id="version">&nbsp;</span></div>
<div id="panes">
<div class="tooltipContainer">
<p id="switch" role="button" aria-label data-tip-position="under" tabindex="0"><span class="fa-icon">power-off</span></p>
<p id="basicTools">
<span id="gotoZap" class="fa-icon tool" data-i18n-tip="popupTipZapper" data-tip-position="under">bolt</span>
<span id="gotoPick" class="fa-icon tool" data-i18n-tip="popupTipPicker" data-tip-position="under">eye-dropper</span>
<a href="logger-ui.html#_" class="fa-icon tool enabled" aria-label="data-tip" data-i18n-tip="popupTipLog" data-tip-position="under" target="uBOLogger" tabindex="0">list-alt</a>
<a href="dashboard.html" class="fa-icon tool enabled" aria-label="data-tip" data-i18n-tip="popupTipDashboard" data-tip-position="under" target="uBODashboard" tabindex="0">sliders</a>
</p>
<h2 id="dfToggler" data-i18n="popupBlockedRequestPrompt">&nbsp;</h2>
<p class="statName">
<span data-i18n="popupBlockedOnThisPagePrompt">&nbsp;</span>
</p>
<p class="statValue" id="page-blocked">?</p>
<div id="refresh" class="fa-icon">refresh</div>
<p class="statName">
<span data-i18n="popupBlockedSinceInstallPrompt">&nbsp;</span>
</p>
<p class="statValue" id="total-blocked">?</p>
<h2 data-i18n="popupHitDomainCountPrompt">&nbsp;</h2>
<p class="statValue" id="popupHitDomainCount">&nbsp;</p>
<div id="extraTools">
<span id="no-popups" class="hnSwitch fa-icon fa-icon-badged" role="button" aria-label tabindex="0">files-o<svg class="nope" viewBox="0 0 20 20"><path d="M1,1 19,19M1,19 19,1" /></svg></span>
<span id="no-large-media" class="hnSwitch fa-icon fa-icon-badged" role="button" aria-label tabindex="0">film<svg class="nope" viewBox="0 0 20 20"><path d="M1,1 19,19M1,19 19,1" /></svg></span>
<span id="no-cosmetic-filtering" class="hnSwitch fa-icon fa-icon-badged" role="button" aria-label tabindex="0">eye-slash<svg class="nope" viewBox="0 0 20 20"><path d="M1,1 19,19M1,19 19,1" /></svg></span>
<span id="no-remote-fonts" class="hnSwitch fa-icon fa-icon-badged" role="button" aria-label tabindex="0">font<svg class="nope" viewBox="0 0 20 20"><path d="M1,1 19,19M1,19 19,1" /></svg></span>
<span id="no-scripting" class="hnSwitch fa-icon fa-icon-badged" role="button" aria-label tabindex="0">code<svg class="nope" viewBox="0 0 20 20"><path d="M1,1 19,19M1,19 19,1" /></svg></span>
</div>
</div><!-- DO NOT REMOVE --><div class="tooltipContainer">
<div id="firewallContainer">
<div data-des="*" data-type="*"><span data-i18n="popupAnyRulePrompt"></span><span data-src="/" data-i18n-tip="popupTipGlobalRules" data-tip-position="under"> </span><span data-src="." data-i18n-tip="popupTipLocalRules" data-tip-position="under"> </span></div>
<div data-des="*" data-type="image"><span data-i18n="popupImageRulePrompt"></span><span data-src="/"> </span><span data-src="."> </span></div>
<div data-des="*" data-type="3p"><span data-i18n="popup3pAnyRulePrompt"></span><span data-src="/"> </span><span data-src="."> </span></div>
<div data-des="*" data-type="inline-script"><span data-i18n="popupInlineScriptRulePrompt"></span><span data-src="/"> </span><span data-src="."> </span></div>
<div data-des="*" data-type="1p-script"><span data-i18n="popup1pScriptRulePrompt"></span><span data-src="/"> </span><span data-src="."> </span></div>
<div data-des="*" data-type="3p-script"><span data-i18n="popup3pScriptRulePrompt"></span><span data-src="/"> </span><span data-src="."> </span></div>
<div data-des="*" data-type="3p-frame"><span data-i18n="popup3pFrameRulePrompt"></span><span data-src="/"> </span><span data-src="."> </span></div>
</div><div id="rulesetTools"><span id="saveRules" class="fa-icon" data-i18n-tip="popupTipSaveRules" data-tip-position="under">lock</span><span id="revertRules" class="fa-icon" data-i18n-tip="popupTipRevertRules" data-tip-position="under">eraser</span></div>
</div>
</div>
<div id="templates" style="display: none">
<div data-des="" data-type="*"><span><span></span><sub></sub></span><span data-src="/"></span><span data-src="."></span><span data-src="."></span></div>
<div id="actionSelector"><span id="dynaAllow"></span><span id="dynaNoop"></span><span id="dynaBlock"></span><span id="dynaCounts"></span></div>
<div id="hotspotTip"></div>
<div id="tooltip"></div>
</div>
<script src="js/fa-icons.js"></script>
<script src="js/vapi.js"></script>
<script src="js/vapi-common.js"></script>
<script src="js/vapi-client.js"></script>
<script src="js/udom.js"></script>
<script src="js/i18n.js"></script>
<script src="js/popup.js" type="module"></script>
</body>
</html>