show-if: display none important did not work in all cases

yellowtree · Nov 9, 2021 · 58460a7 · 58460a7
1 parent 1fe8ef2
commit 58460a7
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 7 deletions.
diff --git a/js/dist/frontend.js b/js/dist/frontend.js
diff --git a/js/dist/frontend.js.map b/js/dist/frontend.js.map
diff --git a/js/lookup/get_info.js b/js/lookup/get_info.js
@@ -52,7 +52,7 @@ async function get_info_cached() {
     try {
         response = await get_info_raw();
     } catch (err) {
-        console.log('Uncaught ERROR ??');
+        console.log('Weird: Uncaught error...', err);
         response = err.responseJSON || err;
     }
 

diff --git a/js/main.js b/js/main.js
@@ -5,7 +5,9 @@ import { options } from './lookup/get_info';
 let firstCall = true;
 
 export function main() {
-console.log('Do Main');
+    if (process.env.NODE_ENV !== 'production') {
+        console.log('Do Main');
+    }
 
     if (firstCall) {
         do_shortcodes_init();

diff --git a/js/shortcodes/onchange.js b/js/shortcodes/onchange.js
@@ -15,14 +15,18 @@ function event_listener_autosave_on_change(event) {
 
     const target = event.target;
     if (target.matches('.js-geoip-detect-input-autosave')) {
-        console.log('autosave on change', target);
+
+        if (process.env.NODE_ENV !== 'production') {
+            console.log('autosave on change', target);
+        }
+
         const property = get_options(target).property;
         const value = target.value;
 
         if (value) {
             _change_counter++;
             if (_listener_active || _change_counter > 100) {
-                console.warn('Thats weird! autosave change detected a recursion!');
+                console.warn('Error: Thats weird! autosave change detected a recursion! Please file a bug report about this.');
                 debugger;
                 return;
             } else {

diff --git a/js/shortcodes/show-if.js b/js/shortcodes/show-if.js
@@ -7,9 +7,13 @@ export function do_shortcode_show_if(el, record) {
     const evaluated = geoip_detect2_shortcode_evaluate_conditions(opt.parsed, opt, record);
 
     if (!evaluated) {
-        el.style.display = "none !important";
+        el.style.display = "none";
+        el.classList.add('geoip-hidden');
+        el.classList.remove('geoip-shown');
     } else {
         el.style.display = '';
+        el.classList.remove('geoip-hidden');
+        el.classList.add('geoip-shown');
     }
 }