From 78a5600d47e33cab4c1a65267172947b990e1a0e Mon Sep 17 00:00:00 2001 From: hackademix Date: Sun, 26 May 2019 00:07:55 +0200 Subject: Skip page autoreloads on transitions between temporary and permanent presets of the same kind. --- src/ui/ui.js | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/ui/ui.js b/src/ui/ui.js index 7e4d45d..c2e12b0 100644 --- a/src/ui/ui.js +++ b/src/ui/ui.js @@ -372,7 +372,7 @@ var UI = (() => { let customizer = target.closest(".customizer"); let row = customizer ? customizer.parentNode.querySelector("tr.customizing") : target.closest("tr.site"); if (!row) return; - row.temp2perm = false; + let isTemp = target.matches("input.temp"); let preset = target.matches("input.preset") ? target : customizer || isTemp ? row.querySelector("input.preset:checked") @@ -392,23 +392,25 @@ var UI = (() => { return; } - let policy = UI.policy; - let {siteMatch, contextMatch, perms} = row; - let presetValue = preset.value; - let policyPreset = presetValue.startsWith("T_") ? policy[presetValue.substring(2)].tempTwin : policy[presetValue]; - - if (policyPreset) { - if (row.perms !== policyPreset) { - row.temp2perm = row.perms && policyPreset.tempTwin === row.perms; - row.perms = policyPreset; - } - } + let {siteMatch, contextMatch, perms} = row; let isCap = customizer && target.matches(".cap"); let tempToggle = preset.parentNode.querySelector("input.temp"); if (ev.type === "change") { + row.temp2perm = false; + let policy = UI.policy; + let presetValue = preset.value; + let policyPreset = presetValue.startsWith("T_") ? policy[presetValue.substring(2)].tempTwin : policy[presetValue]; + + if (policyPreset) { + if (row.perms !== policyPreset) { + row.temp2perm = row.perms && + (policyPreset.tempTwin === row.perms || policyPreset === row.perms._tempTwin); + row.perms = policyPreset; + } + } if (preset.checked) { row.dataset.preset = preset.value; } -- cgit v1.2.3