미완성 패치, include 버그 있음

route/tool/func.py

@@ -393,7 +393,9 @@ def other2(data):
         else:
             req_list += '<link rel="stylesheet" href="/views/main_css/css/' + i_data + '?ver=1">'
     
-    js_filter = {}
+    js_filter = {
+        'load_include.js' : '2'
+    }
     for i_data in os.listdir(os.path.join("views", "main_css", "js")):
         if i_data in js_filter:
             req_list += '<script src="/views/main_css/js/' + i_data + '?ver=' + js_filter[i_data] + '"></script>'

route/tool/set_mark/namu.py

@@ -1015,5 +1015,8 @@ def namu(conn, data, title, main_num):
     data = re.sub('\n<\/ul>', '</ul>', data)
 
     data = re.sub('\n', '<br>', data)
+    data = '<div id="render_contect">' + data + '</div>'
+    
+    plus_data += '<script>render_html();</script>'
 
     return [data, plus_data, backlink]

views/main_css/js/load_include.js

@@ -2,16 +2,11 @@ function load_include(title, name, p_data) {
     var o_data = document.getElementById(name);
 
     var url = "/api/w/" + encodeURI(title) + "?include=1";
-    var url_2 = "/api/markup";
     
     var xhr = new XMLHttpRequest();
     xhr.open("GET", url, true);
     xhr.send(null);
 
-    var xhr_2 = new XMLHttpRequest();
-    xhr_2.open("GET", url_2, true);
-    xhr_2.send(null);
-
     xhr.onreadystatechange = function() {
         if(xhr.readyState === 4 && xhr.status === 200) {
             var o_p_data = JSON.parse(xhr.responseText);
@@ -19,9 +14,11 @@ function load_include(title, name, p_data) {
             
             for(key in p_data) {
                 try {
-                    patt = new RegExp('@' + p_data[key][0] + '@');
+                    var patt = new RegExp('@' + p_data[key][0] + '@', 'g');
                     g_data = g_data.replace(patt, p_data[key][1]);
-                } catch {}
+                } catch(e) {
+                    console.log(e);
+                }
             }
 
             o_data.innerHTML = g_data;

views/main_css/js/render_html.js

@@ -0,0 +1,11 @@
+function render_html() {
+    data = document.getElementById('render_contect').innerHTML;
+
+    t_data = ['b', 'i', 's', 'del']
+    for(var key in t_data) {
+        var patt = new RegExp('<' + t_data[key] + '>((?:(?!<\/' + t_data[key] + '>).)*)<\/' + t_data[key] + '>', 'ig');
+        data = data.replace(patt, '<' + t_data[key] + '>$1</' + t_data[key] + '>');
+    }
+    
+    // document.getElementById('render_contect').innerHTML = data;
+}

views/main_css/js/topic_main_load.js

@@ -20,7 +20,7 @@ function topic_main_load(name, sub, s_num) {
     xhr.onreadystatechange = function() {
         if(xhr.readyState === 4 && xhr.status === 200) {
             t_data = JSON.parse(xhr.responseText);
-            for(key in t_data) {
+            for(var key in t_data) {
                 n_data += t_data[key]['data'];
                 num = key;
             }

views/main_css/js/topic_top_load.js

@@ -11,7 +11,7 @@ function topic_top_load(name, sub) {
     xhr.onreadystatechange = function() {
         if(this.readyState === 4 && this.status === 200) {
             t_data = JSON.parse(this.responseText);
-            for(key in t_data) {
+            for(var key in t_data) {
                 n_data += t_data[key]['data'];
                 num = key;
             }