Explorar el Código

버그 수정 및 라인 수 추가

https://github.com/openNAMU/openNAMU/issues/2212
잉여개발기 (SPDV) hace 2 años
padre
commit
e794cde059

+ 2 - 1
route/tool/func.py

@@ -1072,7 +1072,7 @@ def skin_check(conn, set_n = 0):
         return skin
     
 def cache_v():
-    return '.cache_v255'
+    return '.cache_v256'
 
 def wiki_css(data):
     global global_wiki_set
@@ -1095,6 +1095,7 @@ def wiki_css(data):
         data_css += '<script defer src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.8.0/highlight.min.js" integrity="sha512-rdhY3cbXURo13l/WU9VlaRyaIYeJ/KBakckXIvJNAQde8DgpOmE+eZf7ha4vdqVjTtwQt69bD2wH2LXob/LB7Q==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>'
         data_css += '<script defer src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.8.0/languages/x86asm.min.js" integrity="sha512-HeAchnWb+wLjUb2njWKqEXNTDlcd1QcyOVxb+Mc9X0bWY0U5yNHiY5hTRUt/0twG8NEZn60P3jttqBvla/i2gA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>'
         data_css += '<script defer src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.48.0/min/vs/loader.min.js" integrity="sha512-ZG31AN9z/CQD1YDDAK4RUAvogwbJHv6bHrumrnMLzdCrVu4HeAqrUX7Jsal/cbUwXGfaMUNmQU04tQ8XXl5Znw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>'
+        data_css += '<script defer src="https://cdnjs.cloudflare.com/ajax/libs/highlightjs-line-numbers.js/2.8.0/highlightjs-line-numbers.min.js"></script>'
 
         # Func JS
         data_css += '<script defer src="/views/main_css/js/func/func.js' + data_css_ver + '"></script>'

+ 1 - 0
route/tool/func_render_namumark.py

@@ -1956,6 +1956,7 @@ class class_do_render_namumark:
 
                         if syntax_count == 0:
                             self.render_data_js += 'hljs.highlightAll();\n'
+                            self.render_data_js += 'hljs.initLineNumbersOnLoad();\n'
 
                         data_name = self.get_tool_data_storage('<pre id="syntax"><code class="' + wiki_data_syntax + '">' + wiki_data, '</code></pre>', middle_data_org)
                         syntax_count += 1

+ 6 - 0
views/main_css/css/main.css

@@ -428,4 +428,10 @@ s:hover, strike:hover, del:hover {
 /* 이 부분 이하로는 레거시 */
 #topic_color {
     background: #bbeabb;
+}
+
+/* 외부 확장 기능 연관 */
+td.hljs-ln-line.hljs-ln-code, td.hljs-ln-line.hljs-ln-numbers {
+    padding: 0px !important;
+    border: 0;
 }

+ 1 - 1
views/main_css/css/sub/dark.css

@@ -91,4 +91,4 @@ blockquote {
 
 .opennamu_diff_red {
     background: #803737;
-}
+}

+ 1 - 1
views/main_css/js/func/insert_user_info.js

@@ -35,7 +35,7 @@ function do_insert_user_info() {
                     get_data_ban += '<a href="/recent_block/user/' + opennamu_do_url_encode(name) + '">' + lang_data['normal'] + '</a>'; 
                 } else if(data['data']['ban'][1] === 'c') {
                     get_data_ban += lang_data['normal']; 
-                } else if(data['data']['ban'].match(/^b/)) {
+                } else if(data['data']['ban'][1].match(/^b/)) {
                     get_data_ban += '<a href="/recent_block/cidr">' + lang_data['cidr'] + '</a>';
                 } else {
                     get_data_ban += '<a href="/recent_block/regex">' + lang_data['regex'] + '</a>';