Переглянути джерело

팝업 각주 밖 눌렀을 때 꺼지도록 변경

https://github.com/openNAMU/openNAMU/issues/2167
잉여개발기 (SPDV) 2 роки тому
батько
коміт
8efd262f70

+ 1 - 1
route/tool/func.py

@@ -1069,7 +1069,7 @@ def skin_check(conn, set_n = 0):
         return skin
     
 def cache_v():
-    return '.cache_v245'
+    return '.cache_v246'
 
 def wiki_css(data):
     global global_wiki_set

+ 2 - 1
route/tool/func_render_namumark.py

@@ -1499,7 +1499,8 @@ class class_do_render_namumark:
                             '',
                             footnote_data_org
                         )
-                        self.render_data_js += 'document.getElementById("' + rfn + '_over").addEventListener("click", function() { opennamu_do_footnote_popover("' + rfn + '", "' + fn + '"); });\n'
+                        self.render_data_js += 'document.getElementById("' + rfn + '_over").addEventListener("click", function() { opennamu_do_footnote_popover("' + rfn + '", "' + fn + '", undefined, "open"); });\n'
+                        self.render_data_js += 'document.addEventListener("click", function() { opennamu_do_footnote_popover("' + rfn + '", "' + fn + '", undefined, "close"); });\n'
                     else:
                         data_name = self.get_tool_data_storage('<sup><a fn_target="' + fn + '" id="' + rfn + '" href="#' + fn + '">(' + foot_v_name + ')</a></sup>', '', footnote_data_org)
 

+ 0 - 26
route_go/linux_amd64.sh

@@ -1,26 +0,0 @@
-echo "file_name : "
-read file_name
-
-echo "linux amd64"
-export GOOS=linux
-export GOARCH=amd64
-CGO_ENABLED=0 go build $file_name.go
-mv $file_name ./bin/$file_name.amd64.bin
-
-echo "linux arm64"
-export GOOS=linux
-export GOARCH=arm64
-CGO_ENABLED=0 go build $file_name.go
-mv $file_name ./bin/$file_name.arm64.bin
-
-echo "windows amd64"
-export GOOS=windows
-export GOARCH=amd64
-CGO_ENABLED=0 go build $file_name.go
-mv $file_name.exe ./bin/$file_name.amd64.exe
-
-echo "windows arm64"
-export GOOS=windows
-export GOARCH=arm64
-CGO_ENABLED=0 go build $file_name.go
-mv $file_name.exe ./bin/$file_name.arm64.exe

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.5.0-dev100",
+        "r_ver" : "v3.5.0-dev101",
         "c_ver" : "20240426",
         "s_ver" : "20240426"
     }

+ 8 - 3
views/main_css/js/func/render.js

@@ -208,8 +208,8 @@ function opennamu_do_footnote_spread(set_name, load_name) {
     }
 }
 
-function opennamu_do_footnote_popover(set_name, load_name, sub_obj = undefined) {
-    if(document.getElementById(set_name + '_load').style.display === 'none') {
+function opennamu_do_footnote_popover(set_name, load_name, sub_obj = undefined, do_type = 'open') {
+    if(do_type === 'open') {
         if(sub_obj !== undefined) {
             document.getElementById(set_name + '_load').innerHTML = document.getElementById(sub_obj).innerHTML; 
         } else {
@@ -217,6 +217,7 @@ function opennamu_do_footnote_popover(set_name, load_name, sub_obj = undefined)
             document.getElementById(set_name + '_load').innerHTML = '<a href="#' + load_name + '">(Go)</a> ' + document.getElementById(load_name + '_title').innerHTML;   
         }
         document.getElementById(set_name + '_load').style.display = "inline-block";
+        document.getElementById(set_name + '_load').count = 0;
 
         let width = document.getElementById(set_name + '_load').clientWidth;
         let screen_width = window.innerWidth;
@@ -241,7 +242,11 @@ function opennamu_do_footnote_popover(set_name, load_name, sub_obj = undefined)
             }
         }
     } else {
-        document.getElementById(set_name + '_load').style.display = "none";
+        if(document.getElementById(set_name + '_load').count === 1) {
+            document.getElementById(set_name + '_load').style.display = "none";
+        } else {
+            document.getElementById(set_name + '_load').count = 1;
+        }
     }
 }
 

+ 2 - 1
views/main_css/js/route/list_recent_change.js

@@ -143,7 +143,8 @@ function opennamu_list_recent_change() {
                 continue;
             }
 
-            document.getElementById('opennamu_list_recent_change_' + String(for_a)).addEventListener("click", function() { opennamu_do_footnote_popover('opennamu_list_recent_change_' + String(for_a), '', 'opennamu_history_tool_' + String(for_a)); });
+            document.getElementById('opennamu_list_recent_change_' + String(for_a)).addEventListener("click", function() { opennamu_do_footnote_popover('opennamu_list_recent_change_' + String(for_a), '', 'opennamu_history_tool_' + String(for_a), 'open'); });
+            document.addEventListener("click", function() { opennamu_do_footnote_popover('opennamu_list_recent_change_' + String(for_a), '', 'opennamu_history_tool_' + String(for_a), 'close'); });
         }
     });
 }

+ 2 - 2
views/ringo/js/main.js

@@ -38,7 +38,7 @@ function ringo_opening(data) {
     }
 }
 
-document.onclick = function(event) {
+document.addEventListener("click", function() {
     let cel_list = [];
     for(for_a in ringo_menu_list) {
         cel_list.push(document.getElementById(ringo_menu_list[for_a]));
@@ -49,4 +49,4 @@ document.onclick = function(event) {
 
         setTimeout(function() { ringo_open = 0; }, 100);
     }
-}
+});