@browserless.io/browserless 2.5.0-beta-4 → 2.6.0

package/extensions/ublock/css/epicker-ui.css

@@ -3,6 +3,7 @@ html#ublock0-epicker,
     background: transparent;
     cursor: not-allowed;
     height: 100vh;
+        height: 100svh;
     margin: 0;
     overflow: hidden;
     width: 100vw;
@@ -13,29 +14,41 @@ html#ublock0-epicker,
 #ublock0-epicker aside {
     background-color: var(--surface-1);
     border: 1px solid var(--border-2);
-    bottom: 2px;
     box-sizing: border-box;
     cursor: default;
     display: none;
-    max-height: calc(100vh - 4px);
-    max-width: 36rem;
-    min-width: 24rem;
+    flex-direction: column;
+    max-width: min(32rem, 100vw - 4px);
+    min-width: min(24rem, 100vw - 4px);
     overflow-y: auto;
-    padding: 4px;
     position: fixed;
-    right: 2px;
-    width: calc(40% - 2px);
+    width: min(32rem, 100vw - 4px);
+    z-index: 100;
 }
-/* https://github.com/uBlockOrigin/uBlock-issues/discussions/2114 */
-#ublock0-epicker aside {
-    min-width: min(24rem, 100vw - 4px);
+#ublock0-epicker:not(.zap) aside {
+    display: flex;
+}
+#ublock0-epicker:not(.paused) aside,
+#ublock0-epicker.minimized aside {
+    min-width: min(16rem, 100vw - 4px);
+    overflow: hidden;
+    width: min(16rem, 100vw - 4px);
+}
+#ublock0-epicker:not(.paused) aside > *:not(#windowbar),
+#ublock0-epicker.minimized aside > *:not(#windowbar) {
+    display: none;
 }
-#ublock0-epicker.paused:not(.zap) aside {
-    display: block;
+#ublock0-epicker aside > *:not(:first-child) {
+    padding: 0 2px;
 }
+
 #ublock0-epicker #toolbar {
     display: flex;
+    justify-content: space-between;
 }
+#ublock0-epicker #toolbar button {
+    min-width: 5em;
+    }
 #ublock0-epicker ul {
     margin: 0.25em 0 0 0;
 }
@@ -43,16 +56,6 @@ html#ublock0-epicker,
     background-color: var(--button-preferred-surface);
     color: var(--button-preferred-ink);
 }
-#ublock0-epicker #move {
-    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAECAYAAACtBE5DAAAAFElEQVQI12NgwAfKy8v/M5ANYLoBshgEyQo6H9UAAAAASUVORK5CYII=');
-    cursor: grab;
-    flex-grow: 1;
-    margin: 2px 4px;
-    opacity: 0.8;
-    }
-#ublock0-epicker aside.moving #move {
-    cursor: grabbing;
-}
 #ublock0-epicker section {
     border: 0;
     box-sizing: border-box;
@@ -70,8 +73,8 @@ html#ublock0-epicker,
 #ublock0-epicker section .codeMirrorContainer {
     border: none;
     box-sizing: border-box;
-    height: 8em;
-    max-height: 50vh;
+    height: 6em;
+    max-height: min(6em, 10vh);
     min-height: 1em;
     padding: 2px;
     width: 100%;
@@ -129,8 +132,8 @@ html#ublock0-epicker,
     );
     display: inline-block;
     flex-shrink: 0;
-    height: 16px;
-    width: 16px;
+    height: 20px;
+    width: 20px;
     }
 .resultsetModifier  > span > span:nth-of-type(3) {
     background-color: var(--surface-3);
@@ -174,12 +177,9 @@ html#ublock0-epicker,
     overflow: hidden;
 }
 #ublock0-epicker #candidateFilters {
-    max-height: 14em;
+    max-height: min(12em, 18vh);
     overflow-y: auto;
 }
-#ublock0-epicker #candidateFilters > li:first-of-type {
-    margin-bottom: 0.5em;
-}
 #ublock0-epicker .changeFilter > li > span:nth-of-type(1) {
     font-weight: bold;
 }
@@ -187,6 +187,9 @@ html#ublock0-epicker,
     font-size: smaller;
     color: gray;
 }
+#ublock0-epicker #candidateFilters [data-i18n] {
+    font-size: 90%;
+}
 #ublock0-epicker #candidateFilters .changeFilter {
     list-style-type: none;
     margin: 0 0 0 1em;
@@ -207,36 +210,7 @@ html#ublock0-epicker,
     background-color: var(--surface-2);
 }
 
-/**
-    https://github.com/gorhill/uBlock/issues/3449
-    https://github.com/uBlockOrigin/uBlock-issues/issues/55
-**/
-@keyframes startDialog {
-  0% { opacity: 1.0; }
-  60% { opacity: 1.0; }
-  100% { opacity: 0.1; }
-}
-#ublock0-epicker.paused aside {
-    opacity: 0.1;
-    visibility: visible;
-    z-index: 100;
-}
-#ublock0-epicker.paused:not(.show):not(.hide) aside:not(:hover) {
-    animation-duration: 1.6s;
-    animation-name: startDialog;
-    animation-timing-function: linear;
-}
-#ublock0-epicker.paused aside:hover {
-    opacity: 1;
-}
-#ublock0-epicker.paused.show aside {
-    opacity: 1;
-}
-#ublock0-epicker.paused.hide aside {
-    opacity: 0.1;
-}
-
-#ublock0-epicker svg {
+#ublock0-epicker svg#sea {
     cursor: crosshair;
     box-sizing: border-box;
     height: 100%;
@@ -245,26 +219,62 @@ html#ublock0-epicker,
     top: 0;
     width: 100%;
 }
-#ublock0-epicker.paused svg {
+#ublock0-epicker.paused svg#sea {
     cursor: not-allowed;
 }
-#ublock0-epicker svg > path:first-child {
+#ublock0-epicker svg#sea > path:first-child {
     fill: rgba(0,0,0,0.5);
     fill-rule: evenodd;
 }
-#ublock0-epicker svg > path + path {
+#ublock0-epicker svg#sea > path + path {
     stroke: #F00;
     stroke-width: 0.5px;
     fill: rgba(255,63,63,0.20);
 }
-#ublock0-epicker.zap svg > path + path {
+#ublock0-epicker.zap svg#sea > path + path {
     stroke: #FF0;
     stroke-width: 0.5px;
     fill: rgba(255,255,63,0.20);
 }
-#ublock0-epicker.preview svg > path {
+#ublock0-epicker.preview svg#sea > path {
     fill: rgba(0,0,0,0.10);
 }
-#ublock0-epicker.preview svg > path + path {
+#ublock0-epicker.preview svg#sea > path + path {
     stroke: none;
 }
+
+
+#ublock0-epicker #windowbar {
+    display: flex;
+}
+#ublock0-epicker #windowbar svg {
+    fill: none;
+    pointer-events: none;
+    stroke: var(--ink-1);
+    stroke-width: 3px;
+}
+#ublock0-epicker #windowbar #move {
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAECAYAAACtBE5DAAAAFElEQVQI12NgwAfKy8v/M5ANYLoBshgEyQo6H9UAAAAASUVORK5CYII=');
+    cursor: grab;
+    flex-grow: 1;
+    opacity: 0.8;
+}
+#ublock0-epicker aside.moving #windowbar #move {
+    cursor: grabbing;
+}
+#windowbar #quit,
+#windowbar #minimize {
+    height: 2em;
+    width: 2em;
+}
+#windowbar #quit:hover,
+#windowbar #minimize:hover {
+    background-color: var(--surface-2)
+}
+#ublock0-epicker.minimized #windowbar #minimize svg > path,
+#windowbar #minimize svg > rect {
+    display: none;
+}
+#ublock0-epicker.minimized #windowbar #minimize svg > rect {
+    display: initial;
+}

package/extensions/ublock/css/fa-icons.css

@@ -89,6 +89,7 @@
 .fa-icon > .fa-icon_sun-o {
     width: calc(1em * 1708 / 1792);
     }
+.fa-icon > .fa-icon_book,
 .fa-icon > .fa-icon_download-alt,
 .fa-icon > .fa-icon_font,
 .fa-icon > .fa-icon_search,

package/extensions/ublock/css/logger-ui.css

@@ -2,6 +2,7 @@ body {
     display: flex;
     flex-direction: column;
     height: 100vh;
+        height: 100svh;
     overflow: hidden;
     width: 100vw;
     }
@@ -512,6 +513,7 @@ body[dir="rtl"] .closeButton {
     bottom: 0;
     display: none;
     max-height: min(800px, calc(100vh - 2rem));
+        max-height: min(800px, calc(100svh - 2rem));
     min-width: 360px;
     overflow: hidden;
     position: fixed;

package/extensions/ublock/css/popup-fenix.css

@@ -300,6 +300,7 @@ body.needSave #revertRules {
     }
 :root.desktop body.vMin #firewall {
     max-height: 100vh;
+        max-height: 100svh;
     }
 #firewall > * {
     direction: ltr;

package/extensions/ublock/css/whitelist.css

@@ -1,5 +1,6 @@
 html {
     height: 100vh;
+        height: 100svh;
     overflow: hidden;
     width: 100vw;
     }

package/extensions/ublock/dashboard.html

@@ -4,24 +4,28 @@
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1">
 <title data-i18n="dashboardName"></title>
-<link href="css/themes/default.css" rel="stylesheet" type="text/css">
-<link href="css/common.css" rel="stylesheet" type="text/css">
-<link href="css/dashboard.css" rel="stylesheet" type="text/css">
+<link rel="stylesheet" href="css/themes/default.css">
+<link rel="stylesheet" href="css/fa-icons.css">
+<link rel="stylesheet" href="css/common.css">
+<link rel="stylesheet" href="css/dashboard.css">
 <link rel="shortcut icon" type="image/png" href="img/icon_64.png">
 </head>
 
 <body class="notReady">
     
 <div id="dashboard-nav">
-    <span class="logo"><img data-i18n-title="extName" src="img/ublock.svg"></span><!--
- --><button class="tabButton" type="button" data-pane="settings.html" data-i18n="settingsPageName" tabindex="0"></button><!--
- --><button class="tabButton" type="button" data-pane="3p-filters.html" data-i18n="3pPageName" tabindex="0"></button><!--
- --><button class="tabButton" type="button" data-pane="1p-filters.html" data-i18n="1pPageName" tabindex="0"></button><!--
- --><button class="tabButton" type="button" data-pane="dyna-rules.html" data-i18n="rulesPageName" tabindex="0"></button><!--
- --><button class="tabButton" type="button" data-pane="whitelist.html" data-i18n="whitelistPageName" tabindex="0"></button><!--
- --><button class="tabButton" type="button" data-pane="support.html" data-i18n="supportPageName" tabindex="0"></button><!--
- --><button class="tabButton" type="button" data-pane="about.html" data-i18n="aboutPageName" tabindex="0"></button><!--
- --><button class="tabButton" type="button" data-pane="no-dashboard.html"></button>
+    <span>
+        <span class="logo"><img data-i18n-title="extName" src="img/ublock.svg" alt="uBlock Origin"></span><!--
+     --><button class="tabButton" type="button" data-pane="settings.html" data-i18n="settingsPageName" tabindex="0"></button><!--
+     --><button class="tabButton" type="button" data-pane="3p-filters.html" data-i18n="3pPageName" tabindex="0"></button><!--
+     --><button class="tabButton" type="button" data-pane="1p-filters.html" data-i18n="1pPageName" tabindex="0"></button><!--
+     --><button class="tabButton" type="button" data-pane="dyna-rules.html" data-i18n="rulesPageName" tabindex="0"></button><!--
+     --><button class="tabButton" type="button" data-pane="whitelist.html" data-i18n="whitelistPageName" tabindex="0"></button><!--
+     --><button class="tabButton" type="button" data-pane="support.html" data-i18n="supportPageName" tabindex="0"></button><!--
+     --><button class="tabButton" type="button" data-pane="about.html" data-i18n="aboutPageName" tabindex="0"></button><!--
+     --><button class="tabButton" type="button" data-pane="no-dashboard.html"></button>
+    </span>
+    <a class="wikilink fa-icon" href="https://github.com/gorhill/uBlock/wiki/Dashboard:-My-filters">book</a>
 </div>
 <section id="unsavedWarning" class="notice">
     <div>
@@ -32,16 +36,19 @@
     <div></div>
 </section>
 
-<iframe id="iframe" src=""></iframe>
+<iframe id="iframe" src="about:blank"></iframe>
 
 <script src="lib/hsluv/hsluv-0.1.0.min.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/fa-icons.js" type="module"></script>
 <script src="js/theme.js" type="module"></script>
 <script src="js/i18n.js" type="module"></script>
 <script src="js/dashboard.js" type="module"></script>
+<script src="js/dashboard-common.js" type="module"></script>
 
 </body>
 </html>

package/extensions/ublock/devtools.html

@@ -29,6 +29,8 @@
         <button id="snfe-todnr" type="button">SNFE: DNR<span class="hover"></span></button>
         <button id="snfe-benchmark" type="button" disabled>SNFE: Benchmark<span class="hover"></span></button>
         <button id="cfe-dump" type="button">CFE: Dump<span class="hover"></span></button>
+        <button id="cfe-benchmark" type="button" disabled>CFE: Benchmark<span class="hover"></span></button>
+        <button id="sfe-benchmark" type="button" disabled>SFE: Benchmark<span class="hover"></span></button>
         <button id="purge-all-caches" type="button" data-i18n-title="3pPurgeAll"><span data-i18n="3pPurgeAll">_</span><span class="hover"></span></button>
 </div>
 <div id="console" class="codeMirrorContainer"></div>

package/extensions/ublock/dyna-rules.html

@@ -20,7 +20,7 @@
 
 <div class="body">
     <div id="cloudWidget" class="hide" data-cloud-entry="myRulesPane"></div>
-    <p class="vverbose"><span data-i18n="rulesHint"></span> <a class="fa-icon info" href="https://github.com/gorhill/uBlock/wiki/Dynamic-filtering:-rule-syntax" target="_blank">info-circle</a></p>
+    <p class="vverbose"><span data-i18n="rulesHint"></span></p>
     <div id="diff">
         <div class="tools">
             <div class="ruleActions">
@@ -40,7 +40,7 @@
 <div id="ruleFilter">
     <span><span class="fa-icon">filter</span>&nbsp;<input type="search" size="16"></span>&emsp;<span data-i18n="rulesSort"></span>&nbsp;<select><option value="0" selected data-i18n="rulesSortByType"><option value="1" data-i18n="rulesSortBySource"><option value="2" data-i18n="rulesSortByDestination"></select>&emsp;<span id="diffCollapse" class="fa-icon">double-angle-up</span>
 </div>
-<div class="codeMirrorContainer codeMirrorMergeContainer"></div>
+<div class="codeMirrorContainer codeMirrorMergeContainer cm-theme-override"></div>
 
 <div id="templates" style="display: none;">
     <input class="hidden" id="importFilePicker" type="file" accept="text/plain">

package/extensions/ublock/img/fontawesome/fontawesome-defs.svg

@@ -30,6 +30,7 @@ License - https://github.com/FortAwesome/Font-Awesome/tree/a8386aae19e200ddb0f68
     <symbol id="arrow-right"          viewBox="0 0 1472 1558"><path d="m 1472,779 q 0,54 -37,91 l -651,651 q -39,37 -91,37 -51,0 -90,-37 l -75,-75 q -38,-38 -38,-91 0,-53 38,-91 L 821,971 H 117 Q 65,971 32.5,933.5 0,896 0,843 V 715 Q 0,662 32.5,624.5 65,587 117,587 H 821 L 528,293 q -38,-36 -38,-90 0,-54 38,-90 l 75,-75 q 38,-38 90,-38 53,0 91,38 l 651,651 q 37,35 37,90 z"/></symbol>
     <symbol id="bar-chart"            viewBox="0 0 2048 1536"><path d="m 640,768 0,512 -256,0 0,-512 256,0 z m 384,-512 0,1024 -256,0 0,-1024 256,0 z m 1024,1152 0,128 L 0,1536 0,0 l 128,0 0,1408 1920,0 z m -640,-896 0,768 -256,0 0,-768 256,0 z m 384,-384 0,1152 -256,0 0,-1152 256,0 z"/></symbol>
     <symbol id="bolt"                 viewBox="0 0  896 1664"><path d="m 885.08696,438 q 18,20 7,44 l -540,1157 q -13,25 -42,25 -4,0 -14,-2 -17,-5 -25.5,-19 -8.5,-14 -4.5,-30 l 197,-808 -406,101 q -4,1 -12,1 -18,0 -31,-11 Q -3.9130435,881 1.0869565,857 L 202.08696,32 q 4,-14 16,-23 12,-9 28,-9 l 328,0 q 19,0 32,12.5 13,12.5 13,29.5 0,8 -5,18 l -171,463 396,-98 q 8,-2 12,-2 19,0 34,15 z"/></symbol>
+    <symbol id="book"                 viewBox="0 0 1664 1536"><path d="m 1639.2625,350 c 25,36 32,83 18,129 l -275,906 c -25,85 -113,151 -199,151 H 260.26251 c -102,0 -211,-81 -248,-185 -16,-45 -16,-89 -2,-127 2,-20 6,-40 7,-64 1,-16 -8,-29 -6,-41 4,-24 25,-41 41,-68 30,-50 64,-131 75,-183 5,-19 -5,-41 0,-58 5,-19 24,-33 34,-51 27,-46 62,-135 67,-182 2,-21 -8,-44 -2,-60 7,-23 29,-33 44,-53 24,-33 64,-128 70,-181 2,-17 -8,-34 -5,-52 4,-19 28,-39 44,-62 42,-62 50,-199 177,-163 l -1,3 c 17,-4 34,-9 51,-9 h 761 c 47,0 89,21 114,56 26,36 32,83 18,130 l -274,906 c -47,154 -73,188 -200,188 H 156.26251 c -13,0 -29,3 -38,15 -8,12 -9,21 -1,43 20,58 89,70 144,70 h 923 c 37,0 80,-21 91,-57 l 300,-987 c 6,-19 6,-39 5,-57 23,9 44,23 59,43 z m -1064,2 c -6,18 4,32 22,32 h 608 c 17,0 36,-14 42,-32 l 21,-64 c 6,-18 -4,-32 -22,-32 H 638.26251 c -17,0 -36,14 -42,32 z m -83,256 c -6,18 4,32 22,32 h 608 c 17,0 36,-14 42,-32 l 21,-64 c 6,-18 -4,-32 -22,-32 H 555.26251 c -17,0 -36,14 -42,32 z"/></symbol>
     <symbol id="clipboard"            viewBox="0 0 1792 1792"><path d="m 768,1664 896,0 0,-640 -416,0 q -40,0 -68,-28 -28,-28 -28,-68 l 0,-416 -384,0 0,1152 z m 256,-1440 0,-64 q 0,-13 -9.5,-22.5 Q 1005,128 992,128 l -704,0 q -13,0 -22.5,9.5 Q 256,147 256,160 l 0,64 q 0,13 9.5,22.5 9.5,9.5 22.5,9.5 l 704,0 q 13,0 22.5,-9.5 9.5,-9.5 9.5,-22.5 z m 256,672 299,0 -299,-299 0,299 z m 512,128 0,672 q 0,40 -28,68 -28,28 -68,28 l -960,0 q -40,0 -68,-28 -28,-28 -28,-68 l 0,-160 -544,0 Q 56,1536 28,1508 0,1480 0,1440 L 0,96 Q 0,56 28,28 56,0 96,0 l 1088,0 q 40,0 68,28 28,28 28,68 l 0,328 q 21,13 36,28 l 408,408 q 28,28 48,76 20,48 20,88 z"/></symbol>
     <symbol id="clock-o"              viewBox="0 0 1536 1536"><path d="m 896,416 v 448 q 0,14 -9,23 -9,9 -23,9 H 544 q -14,0 -23,-9 -9,-9 -9,-23 v -64 q 0,-14 9,-23 9,-9 23,-9 H 768 V 416 q 0,-14 9,-23 9,-9 23,-9 h 64 q 14,0 23,9 9,9 9,23 z m 416,352 q 0,-148 -73,-273 -73,-125 -198,-198 -125,-73 -273,-73 -148,0 -273,73 -125,73 -198,198 -73,125 -73,273 0,148 73,273 73,125 198,198 125,73 273,73 148,0 273,-73 125,-73 198,-198 73,-125 73,-273 z m 224,0 q 0,209 -103,385.5 Q 1330,1330 1153.5,1433 977,1536 768,1536 559,1536 382.5,1433 206,1330 103,1153.5 0,977 0,768 0,559 103,382.5 206,206 382.5,103 559,0 768,0 977,0 1153.5,103 1330,206 1433,382.5 1536,559 1536,768 Z"/></symbol>
     <symbol id="cloud-download"       viewBox="0 0 1920 1408"><path d="m 1280,800 q 0,-14 -9,-23 -9,-9 -23,-9 l -224,0 0,-352 q 0,-13 -9.5,-22.5 Q 1005,384 992,384 l -192,0 q -13,0 -22.5,9.5 Q 768,403 768,416 l 0,352 -224,0 q -13,0 -22.5,9.5 -9.5,9.5 -9.5,22.5 0,14 9,23 l 352,352 q 9,9 23,9 14,0 23,-9 l 351,-351 q 10,-12 10,-24 z m 640,224 q 0,159 -112.5,271.5 Q 1695,1408 1536,1408 l -1088,0 Q 263,1408 131.5,1276.5 0,1145 0,960 0,830 70,720 140,610 258,555 256,525 256,512 256,300 406,150 556,0 768,0 q 156,0 285.5,87 129.5,87 188.5,231 71,-62 166,-62 106,0 181,75 75,75 75,181 0,76 -41,138 130,31 213.5,135.5 Q 1920,890 1920,1024 Z"/></symbol>

package/extensions/ublock/js/1p-filters.js

@@ -21,12 +21,10 @@
 
 /* global CodeMirror, uBlockDashboard */
 
-'use strict';
-
-import { onBroadcast } from './broadcast.js';
+import './codemirror/ubo-static-filtering.js';
 import { dom, qs$ } from './dom.js';
 import { i18n$ } from './i18n.js';
-import './codemirror/ubo-static-filtering.js';
+import { onBroadcast } from './broadcast.js';
 
 /******************************************************************************/
 
@@ -53,8 +51,6 @@ const cmEditor = new CodeMirror(qs$('#userFilters'), {
 
 uBlockDashboard.patchCodeMirrorEditor(cmEditor);
 
-let cachedUserFilters = '';
-
 /******************************************************************************/
 
 // Add auto-complete ability to the editor. Polling is used as the suggested
@@ -91,9 +87,32 @@ vAPI.messaging.send('dashboard', {
 
 /******************************************************************************/
 
+let originalState = {
+    enabled: true,
+    trusted: false,
+    filters: '',
+};
+
+function getCurrentState() {
+    const enabled = qs$('#enableMyFilters input').checked;
+    return {
+        enabled,
+        trusted: enabled && qs$('#trustMyFilters input').checked,
+        filters: getEditorText(),
+    };
+}
+
+function rememberCurrentState() {
+    originalState = getCurrentState();
+}
+
+function currentStateChanged() {
+    return JSON.stringify(getCurrentState()) !== JSON.stringify(originalState);
+}
+
 function getEditorText() {
     const text = cmEditor.getValue().replace(/\s+$/, '');
-    return text === '' ? text : text + '\n';
+    return text === '' ? text : `${text}\n`;
 }
 
 function setEditorText(text) {
@@ -102,12 +121,30 @@ function setEditorText(text) {
 
 /******************************************************************************/
 
-function userFiltersChanged(changed) {
-    if ( typeof changed !== 'boolean' ) {
-        changed = self.hasUnsavedData();
-    }
+function userFiltersChanged(details = {}) {
+    const changed = typeof details.changed === 'boolean'
+        ? details.changed
+        : self.hasUnsavedData();
     qs$('#userFiltersApply').disabled = !changed;
     qs$('#userFiltersRevert').disabled = !changed;
+    const enabled = qs$('#enableMyFilters input').checked;
+    dom.attr('#trustMyFilters .input.checkbox', 'disabled', enabled ? null : '');
+    const trustedbefore = cmEditor.getOption('trustedSource');
+    const trustedAfter = enabled && qs$('#trustMyFilters input').checked;
+    if ( trustedAfter === trustedbefore ) { return; }
+    cmEditor.startOperation();
+    cmEditor.setOption('trustedSource', trustedAfter);
+    const doc = cmEditor.getDoc();
+    const history = doc.getHistory();
+    const selections = doc.listSelections();
+    doc.replaceRange(doc.getValue(),
+        { line: 0, ch: 0 },
+        { line: doc.lineCount(), ch: 0 }
+    );
+    doc.setSelections(selections);
+    doc.setHistory(history);
+    cmEditor.endOperation();
+    cmEditor.focus();
 }
 
 /******************************************************************************/
@@ -118,7 +155,7 @@ function userFiltersChanged(changed) {
 //   background.
 
 function threeWayMerge(newContent) {
-    const prvContent = cachedUserFilters.trim().split(/\n/);
+    const prvContent = originalState.filters.trim().split(/\n/);
     const differ = new self.diff_match_patch();
     const newChanges = differ.diff(
         prvContent,
@@ -167,19 +204,22 @@ async function renderUserFilters(merge = false) {
     });
     if ( details instanceof Object === false || details.error ) { return; }
 
-    cmEditor.setOption('trustedSource', details.trustedSource === true);
+    cmEditor.setOption('trustedSource', details.trusted);
+
+    qs$('#enableMyFilters input').checked = details.enabled;
+    qs$('#trustMyFilters input').checked = details.trusted;
 
     const newContent = details.content.trim();
 
     if ( merge && self.hasUnsavedData() ) {
         setEditorText(threeWayMerge(newContent));
-        userFiltersChanged(true);
+        userFiltersChanged({ changed: true });
     } else {
         setEditorText(newContent);
-        userFiltersChanged(false);
+        userFiltersChanged({ changed: false });
     }
 
-    cachedUserFilters = newContent;
+    rememberCurrentState();
 }
 
 /******************************************************************************/
@@ -224,7 +264,7 @@ function exportUserFiltersToFile() {
         .replace('{{datetime}}', uBlockDashboard.dateNowToSensibleString())
         .replace(/ +/g, '_');
     vAPI.download({
-        'url': 'data:text/plain;charset=utf-8,' + encodeURIComponent(val + '\n'),
+        'url': `data:text/plain;charset=utf-8,${encodeURIComponent(val)}`,
         'filename': filename
     });
 }
@@ -232,21 +272,26 @@ function exportUserFiltersToFile() {
 /******************************************************************************/
 
 async function applyChanges() {
+    const state = getCurrentState();
     const details = await vAPI.messaging.send('dashboard', {
         what: 'writeUserFilters',
-        content: getEditorText(),
+        content: state.filters,
+        enabled: state.enabled,
+        trusted: state.trusted,
     });
     if ( details instanceof Object === false || details.error ) { return; }
-
-    cachedUserFilters = details.content.trim();
-    userFiltersChanged(false);
+    rememberCurrentState();
+    userFiltersChanged({ changed: false });
     vAPI.messaging.send('dashboard', {
         what: 'reloadAllFilters',
     });
 }
 
 function revertChanges() {
-    setEditorText(cachedUserFilters);
+    qs$('#enableMyFilters input').checked = originalState.enabled;
+    qs$('#trustMyFilters input').checked = originalState.trusted;
+    setEditorText(originalState.filters);
+    userFiltersChanged();
 }
 
 /******************************************************************************/
@@ -268,8 +313,10 @@ self.cloud.onPull = setCloudData;
 
 /******************************************************************************/
 
+self.wikilink = 'https://github.com/gorhill/uBlock/wiki/Dashboard:-My-filters';
+
 self.hasUnsavedData = function() {
-    return getEditorText().trim() !== cachedUserFilters;
+    return currentStateChanged();
 };
 
 /******************************************************************************/
@@ -278,6 +325,8 @@ self.hasUnsavedData = function() {
 dom.on('#exportUserFiltersToFile', 'click', exportUserFiltersToFile);
 dom.on('#userFiltersApply', 'click', ( ) => { applyChanges(); });
 dom.on('#userFiltersRevert', 'click', revertChanges);
+dom.on('#enableMyFilters input', 'change', userFiltersChanged);
+dom.on('#trustMyFilters input', 'change', userFiltersChanged);
 
 (async ( ) => {
     await renderUserFilters();