From e4732ff224d8e5cc70ecdab3f15ce5ef3698a917 Mon Sep 17 00:00:00 2001 From: Taro Matsuzawa Date: Thu, 25 Jul 2024 10:23:10 +0900 Subject: [PATCH 1/3] fixes: render 2 maps when change status in editing view --- app/helpers/gtt_map_helper.rb | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/helpers/gtt_map_helper.rb b/app/helpers/gtt_map_helper.rb index 5e6525d..22e2226 100644 --- a/app/helpers/gtt_map_helper.rb +++ b/app/helpers/gtt_map_helper.rb @@ -70,13 +70,6 @@ def map_tag(map: nil, layers: map&.layers, window.createGttClient(target); contentObserver(); }, { once: true }); - var target = document.getElementById('#{uid}'); - if ( - document.readyState === 'complete' - && !target.hasChildNodes() - ) { - window.createGttClient(target); - } } document.addEventListener('DOMContentLoaded', function(){ var target = document.getElementById('#{uid}'); From 1fabfc4c8096ed21c67fa948b797e789796845a2 Mon Sep 17 00:00:00 2001 From: Taro Matsuzawa Date: Thu, 25 Jul 2024 10:54:42 +0900 Subject: [PATCH 2/3] revert fixes and add flag for edit mode --- app/helpers/gtt_map_helper.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/helpers/gtt_map_helper.rb b/app/helpers/gtt_map_helper.rb index 22e2226..cc77cdc 100644 --- a/app/helpers/gtt_map_helper.rb +++ b/app/helpers/gtt_map_helper.rb @@ -67,9 +67,18 @@ def map_tag(map: nil, layers: map&.layers, if (!#{show}) { document.addEventListener('contentUpdated', function(){ var target = document.getElementById('#{uid}'); + target.classList.add('map-editable'); window.createGttClient(target); contentObserver(); }, { once: true }); + var target = document.getElementById('#{uid}'); + if ( + document.readyState === 'complete' + && !target.hasChildNodes() + && document.getElementsByClassName('map-editable').length === 1 + ) { + window.createGttClient(target); + } } document.addEventListener('DOMContentLoaded', function(){ var target = document.getElementById('#{uid}'); From fc4166eabc1b5dddf9f2983623400cf2535cf5c7 Mon Sep 17 00:00:00 2001 From: Taro Matsuzawa Date: Thu, 25 Jul 2024 11:17:59 +0900 Subject: [PATCH 3/3] remove contentUpdated listener --- app/helpers/gtt_map_helper.rb | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/helpers/gtt_map_helper.rb b/app/helpers/gtt_map_helper.rb index cc77cdc..cb6e3b2 100644 --- a/app/helpers/gtt_map_helper.rb +++ b/app/helpers/gtt_map_helper.rb @@ -65,17 +65,10 @@ def map_tag(map: nil, layers: map&.layers, observer.observe(document.body, config); } if (!#{show}) { - document.addEventListener('contentUpdated', function(){ - var target = document.getElementById('#{uid}'); - target.classList.add('map-editable'); - window.createGttClient(target); - contentObserver(); - }, { once: true }); var target = document.getElementById('#{uid}'); if ( document.readyState === 'complete' && !target.hasChildNodes() - && document.getElementsByClassName('map-editable').length === 1 ) { window.createGttClient(target); }