2
0
Эх сурвалжийг харах

일부 HTML 추가 지원

Surplus_Up (2DU) 6 жил өмнө
parent
commit
5bfa6b96a1

+ 1 - 1
route/tool/func.py

@@ -408,7 +408,7 @@ def other2(data):
     
     js_filter = {
         'load_include.js' : '2',
-        'render_html.js' : '3',
+        'render_html.js' : '4',
         'do_open_foot.js' : '4',
         'topic_main_load.js' : '5',
         'topic_plus_load.js' : '5',

+ 3 - 6
route/tool/set_mark/namumark.py

@@ -444,7 +444,7 @@ def namumark(conn, data, title, main_num, include_num):
     backlink = []
     end_data = []
     
-    include_num = include_num + '-' if include_num else ''
+    include_num = include_num + '_' if include_num else ''
     
     data = re.sub('<math>(?P<in>(?:(?!<\/math>).)+)<\/math>', '[math(\g<in>)]', data)
 
@@ -1277,10 +1277,7 @@ def namumark(conn, data, title, main_num, include_num):
     data = re.sub('<\/ul>\n<ul>', '</ul><ul>', data)
     data = re.sub('\n<\/ul>', '</ul>', data)
     data = re.sub('\n', '<br>', data)
-
-    if include_num == '':
-        plus_data = '<script>render_html();</script>' + plus_data
-    else:
-        plus_data = '<script>render_html(\'' + include_num + '\');</script>' + plus_data
+        
+    plus_data = '<script>render_html("' + include_num + 'render_contect");</script>' + plus_data
 
     return [data, plus_data, backlink]

+ 5 - 4
views/main_css/js/render_html.js

@@ -2,10 +2,11 @@ function render_html(name = '') {
     var num = 0;
     while(1) {
         num += 1
-        if(document.getElementById(name + 'render_contect_' + String(num))) {
-            data = document.getElementById(name + 'render_contect_' + String(num)).innerHTML;
+        
+        if(document.getElementById(name + '_' + String(num))) {
+            data = document.getElementById(name + '_' + String(num)).innerHTML;
 
-            var t_data = ['b', 'i', 's', 'del']
+            var t_data = ['b', 'i', 's', 'del', 'strong', 'bold', 'em', 'sub', 'sup']
             for(var key in t_data) {
                 var patt = new RegExp('&lt;' + t_data[key] + '&gt;((?:(?!&lt;\/' + t_data[key] + '&gt;).)*)&lt;\/' + t_data[key] + '&gt;', 'ig');
                 data = data.replace(patt, '<' + t_data[key] + '>$1</' + t_data[key] + '>');
@@ -38,7 +39,7 @@ function render_html(name = '') {
                 return '<a id="out_link" href="' + in_data.replace(/^javascript/ig, '') + '">' + in_data_2 + '</a>'
             });
             
-            document.getElementById(name + 'render_contect_' + String(num)).innerHTML = data;
+            document.getElementById(name + '_' + String(num)).innerHTML = data;
         } else {
             break;
         }