fix thread js

route/tool/func.py

@@ -883,19 +883,21 @@ def wiki_css(data):
     data_css += '<script src="/views/main_css/js/func/func.js?ver=' + data_css_ver + '"></script>'
     
     data_css += '<script src="/views/main_css/js/func/http_warning_text.js?ver=' + data_css_ver + '"></script>'
-    data_css += '<script defer src="/views/main_css/js/func/ie_end_of_life.js?ver=' + data_css_ver + '"></script>'
-    data_css += '<script defer src="/views/main_css/js/func/shortcut.js?ver=' + data_css_ver + '"></script>'
-    data_css += '<script defer src="/views/main_css/js/func/user_name_parser.js?ver=' + data_css_ver + '"></script>'
+    data_css += '<script src="/views/main_css/js/func/ie_end_of_life.js?ver=' + data_css_ver + '"></script>'
+    data_css += '<script src="/views/main_css/js/func/shortcut.js?ver=' + data_css_ver + '"></script>'
+    data_css += '<script src="/views/main_css/js/func/user_name_parser.js?ver=' + data_css_ver + '"></script>'
     
     # Render JS
     data_css += '<script src="/views/main_css/js/render/markdown.js?ver=' + data_css_ver + '"></script>'
     data_css += '<script src="/views/main_css/js/render/wiki.js?ver=' + data_css_ver + '"></script>'
     
+    # Route JS
+    data_css += '<script src="/views/main_css/js/route/thread.js?ver=' + data_css_ver + '"></script>'
+    
     # 레거시 일반 JS
     data_css += '<script src="/views/main_css/js/load_editor.js?ver=' + data_css_ver + '"></script>'
     data_css += '<script src="/views/main_css/js/load_skin_set.js?ver=' + data_css_ver + '"></script>'
     data_css += '<script src="/views/main_css/js/load_something.js?ver=' + data_css_ver + '"></script>'
-    data_css += '<script src="/views/main_css/js/load_topic.js?ver=' + data_css_ver + '"></script>'
     
     # 레거시 렌더러 JS
     data_css += '<script src="/views/main_css/js/render_html.js?ver=' + data_css_ver + '"></script>'

route/tool/func_mark.py

@@ -130,21 +130,19 @@ class class_do_render:
                     []
                 ]
             elif rep_data == 'markdown':
-                data_in = (data_in + 'ADD') if data_in else ''
+                data_in = (data_in + '_') if data_in else ''
                 doc_data = html.escape(doc_data)
                 doc_name = html.escape(doc_name)
                 
                 data_end = [
                     '<pre class="render_content_load" id="' + data_in + 'render_content_load">' + html.escape(doc_data) + '</pre>' + \
                     '<div class="render_content" id="' + data_in + 'render_content"></div>', 
-                    '''
-                        new opennamu_render_markdown(
-                            render_part_id = "render_content_load",
-                            render_part_id_after = "render_content",
-                            render_part_id_add = "''' + data_in + '''",
-                            doc_name = "''' + doc_name + '''"
-                        ).do_main();
-                    ''',
+                    'new opennamu_render_markdown(' + \
+                        'render_part_id = "render_content_load",' + \
+                        'render_part_id_after = "render_content",' + \
+                        'render_part_id_add = "' + data_in + '",' + \
+                        'doc_name = "' + doc_name + '"' + \
+                    ').do_main();',
                     []
                 ]
             else:

route/topic.py

@@ -125,7 +125,7 @@ def topic(topic_num = 0):
                     <div id="top_topic"></div>
                     <div id="main_topic"></div>
                     <div id="plus_topic"></div>
-                    <script>new_topic_load("''' + topic_num + '''");</script>
+                    <script>opennamu_do_thread_make("''' + topic_num + '''");</script>
                     <a href="/thread/''' + topic_num + '/tool">(' + load_lang('topic_tool') + ''')</a>
                     <hr class="main_hr">
                     <form style="''' + display + '''" method="post">

route/topic_close_list.py

@@ -40,9 +40,9 @@ def topic_close_list(name = 'Test'):
                 <div id="topic_pre_''' + data[0] + '''"></div>
                 <div id="topic_back_pre_''' + data[0] + '''"></div>
                 <script>
-                    new_topic_load(''' + data[0] + ', "list", "/normal/1", "topic_pre_' + data[0] + '''");
+                    opennamu_do_thread_make(''' + data[0] + ', "list", "/normal/1", "topic_pre_' + data[0] + '''");
                     if(''' + t_data[0][0] + ''' !== 1) {
-                        new_topic_load(''' + data[0] + ', "list", "/normal/' + t_data[0][0] + '", "topic_back_pre_' + data[0] + '''");
+                        opennamu_do_thread_make(''' + data[0] + ', "list", "/normal/' + t_data[0][0] + '", "topic_back_pre_' + data[0] + '''");
                     }
                 </script>
             '''

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.4 (stable1) (beta1) (dev5)",
+        "r_ver" : "v3.4.4 (stable1) (beta1) (dev6)",
         "c_ver" : "3500101",
         "s_ver" : "3500110"
     }

views/main_css/js/func/ie_end_of_life.js

@@ -1,4 +1,4 @@
-function opennamu_ie_end_support() {
+function opennamu_do_ie_end_support() {
     if(document.currentScript === undefined) {
         window.location = 'microsoft-edge:' + window.location;
         setTimeout(function() {
@@ -7,4 +7,4 @@ function opennamu_ie_end_support() {
     }
 }
 
-opennamu_ie_end_support();
+opennamu_do_ie_end_support();

views/main_css/js/render/markdown.js

@@ -9,6 +9,9 @@ class opennamu_render_markdown {
         doc_name
     ) {
         this.doc_data = document.getElementById(render_part_id_add + render_part_id).innerHTML;
+
+        render_part_id_add = render_part_id_add.replace(/_/g, '<underBar>');
+
         this.doc_data = this.doc_data.replace(/&amp;/g, '&');
         this.doc_data = '<brStart>\n' + this.doc_data + '\n<brEnd>';
         this.doc_data.replace(/\r/g, '');
@@ -478,6 +481,7 @@ class opennamu_render_markdown {
         this.doc_data = this.doc_data.replace(/\n?<brEnd>/g, '');
         
         this.doc_data = this.doc_data.replace(/<underBar>/g, '_');
+        this.render_part_id_add = this.render_part_id_add.replace(/<underBar>/g, '_');
         
         this.doc_data = this.doc_data.replace(/\n/g, '<br>');
         

views/main_css/js/load_topic.js → views/main_css/js/route/thread.js

@@ -1,27 +1,37 @@
-function new_topic_load(topic_num, type_do = 'top', some = '', where = 'top_topic') {
+// 좀 더 개선 필요
+// use strict 적용 필요 (eval 동작에 문제 있음)
+function opennamu_do_thread_make(topic_num, type_do = 'top', some = '', where = 'top_topic') {
+    let url = '';
     if(type_do === 'top') {
-        var url = "/api/thread/" + topic_num + "/top";
+        url = "/api/thread/" + topic_num + "/top";
     } else if(type_do === 'main') {
-        var url = "/api/thread/" + topic_num;
+        url = "/api/thread/" + topic_num;
     } else {
-        var url = "/api/thread/" + topic_num + some;
+        url = "/api/thread/" + topic_num + some;
     }
 
-    var xhr = new XMLHttpRequest();
+    let xhr = new XMLHttpRequest();
     xhr.open("GET", url, true);
     xhr.send(null);
 
     xhr.onreadystatechange = function() {
         if(this.readyState === 4 && this.status === 200) {
-            var data_t = JSON.parse(this.responseText);
-            var start = 0;
-            var key_v = '/normal/1';
+            let data_t = JSON.parse(this.responseText);
             
-            for(var key in data_t) {
-                var data_a = '';
+            let start = 0;
+            let key_v = '/normal/1';
+            let admin = '';
+            let ip_first = '';
+            
+            let data_all = '';
+            let data_all_js = '';
+            
+            for(let key in data_t) {
+                let data_a = '';
+                
                 if(start === 0) {
-                    var admin = data_t['data_main']['admin'];
-                    var ip_first = data_t['data_main']['ip_first'];
+                    admin = data_t['data_main']['admin'];
+                    ip_first = data_t['data_main']['ip_first'];
                 
                     start = 1;
                 }
@@ -32,13 +42,13 @@ function new_topic_load(topic_num, type_do = 'top', some = '', where = 'top_topi
                 
                 key_v = '/normal/' + String(Number(key) + 1);
                 
-                var color_b = '';
-                var color_t = '';
+                let color_b = '';
+                let color_t = '';
                 
-                var ip = data_t[key]['ip_pas'];
-                var ip_o = data_t[key]['ip'];
-                var blind = data_t[key]['blind'];
-                var data_i_pas = data_t[key]['data_pas'][0];
+                let ip = data_t[key]['ip_pas'];
+                let ip_o = data_t[key]['ip'];
+                let blind = data_t[key]['blind'];
+                let data_i_pas = data_t[key]['data_pas'][0];
                 
                 if(data_i_pas === '') {
                     data_i_pas = '<br>';
@@ -99,29 +109,32 @@ function new_topic_load(topic_num, type_do = 'top', some = '', where = 'top_topi
                     '<hr class="main_hr">' + 
                 ''
 
-                document.getElementById(where).innerHTML += data_a;
-                eval(data_t[key]['data_pas'][1]);
+                data_all += data_a;
+                data_all_js += data_t[key]['data_pas'][1] + '\n';
             }
             
+            document.getElementById(where).innerHTML += data_all;
+            eval(data_all_js);
+            
             opennamu_do_ip_parser();
             
             if(type_do === 'top') {
-                new_topic_load(topic_num, 'main', '', 'main_topic');
+                opennamu_do_thread_make(topic_num, 'main', '', 'main_topic');
             } else if(type_do === 'main') {
-                data_url_v = window.location.href.split('#');
+                let data_url_v = window.location.href.split('#');
                 if(data_url_v.length !== 0) {
                     if(document.getElementById(data_url_v[1])) {
                         document.getElementById(data_url_v[1]).focus();
                     }
                 }
                 
-                new_topic_load(topic_num, 're', key_v, where);
+                opennamu_do_thread_make(topic_num, 're', key_v, where);
             } else if(type_do === 're') {
                 setTimeout(function() {
                     if(start === 0) {
-                        new_topic_load(topic_num, 're', some, where);
+                        opennamu_do_thread_make(topic_num, 're', some, where);
                     } else {
-                        new_topic_load(topic_num, 're', key_v, where);
+                        opennamu_do_thread_make(topic_num, 're', key_v, where);
                     }
                 }, 2000);
             }

views/main_css/js/route/topic.js

@@ -1,5 +0,0 @@
-"use strict";
-
-function opennamu_route_topic() {
-    
-}