Parcourir la source

토론 목록에서 내용 보기

Surplus_Up (2DU) il y a 6 ans
Parent
commit
04d7ac738c

+ 1 - 1
route/topic.py

@@ -92,7 +92,7 @@ def topic_2(conn, name, sub):
                 <div id="main_topic"></div>
                 <div id="plus_topic"></div>
                 <script>topic_top_load("''' + name + '''", "''' + sub + '''");</script>
-                <a id="reload" href="javascript:void(0);" onclick="reload();">(''' + load_lang('reload') + ''')</a> <a href="/topic/''' + url_pas(name) + '''/sub/''' + url_pas(sub) + '''/tool">(''' + load_lang('topic_tool') + ''')</a>
+                <a id="reload" href="javascript:void(0);" onclick="topic_reload();">(''' + load_lang('reload') + ''')</a> <a href="/topic/''' + url_pas(name) + '''/sub/''' + url_pas(sub) + '''/tool">(''' + load_lang('topic_tool') + ''')</a>
                 <hr class=\"main_hr\">
                 <form style="''' + display + '''" method="post">
                     <textarea style="height: 100px;" name="content"></textarea>

+ 13 - 1
route/topic_close_list.py

@@ -46,7 +46,10 @@ def topic_close_list_2(conn, name, tool):
                 <button type="submit">''' + load_lang('go') + '''</button>
             '''
 
+        t_num = 0
         for data in curs.fetchall():
+            t_num += 1
+            
             curs.execute("select data, date, ip, block from topic where title = ? and sub = ? and id = '1'", [name, data[0]])
             if curs.fetchall():                
                 it_p = 0
@@ -59,9 +62,18 @@ def topic_close_list_2(conn, name, tool):
                 if it_p != 1:
                     curs.execute("select id from topic where title = ? and sub = ? order by date desc limit 1", [name, data[0]])
                     t_data = curs.fetchall()
+                    print(t_data)
                 
                     div += '''
-                        <h2><a href="/topic/''' + url_pas(name) + '''/sub/''' + url_pas(data[0]) + '''">''' + data[0] + '''</a></h2>
+                        <h2><a href="/topic/''' + url_pas(name) + '''/sub/''' + url_pas(data[0]) + '''">''' + str(t_num) + '''. ''' + data[0] + '''</a></h2>
+                        <div id="topic_pre_''' + str(t_num) + '''"></div>
+                        <div id="topic_back_pre_''' + str(t_num) + '''"></div>
+                        <script>
+                            topic_list_load("''' + name + '''", "''' + data[0] + '''", "1", "topic_pre_''' + str(t_num) + '''");
+                            if("''' + str(t_num) + '''" !== "1") {
+                                topic_list_load("''' + name + '''", "''' + data[0] + '''", "''' + t_data[0][0] + '''", "topic_back_pre_''' + str(t_num) + '''");
+                            }
+                        </script>
                     '''
 
         if div == '':

+ 23 - 0
views/main_css/js/topic_list_load.js

@@ -0,0 +1,23 @@
+function topic_list_load(name, sub, s_num, where) {
+    var o_data = document.getElementById(where);
+    var url = "/api/topic/" + encodeURI(name) + "/sub/" + encodeURI(sub) + "?render=1&num=" + s_num;
+    var n_data = "";
+    var num = 1;
+    
+    var xhr = new XMLHttpRequest();
+    xhr.open("GET", url, true);
+    xhr.send(null);
+
+    xhr.onreadystatechange = function() {
+        if(this.readyState === 4 && this.status === 200) {
+            t_data = JSON.parse(this.responseText);
+            for(key in t_data) {
+                n_data += t_data[key]['data'];
+                num = key;
+            }
+            
+            o_data.innerHTML = n_data;
+        }
+    }
+    
+}

+ 9 - 3
views/main_css/js/topic_main_load.js

@@ -1,6 +1,10 @@
-function topic_main_load(name, sub) {
+function topic_main_load(name, sub, s_num = null) {
     var o_data = document.getElementById('main_topic');
-    var url = "/api/topic/" + name + "/sub/" + sub + "?render=1";
+    if(s_num) {
+        var url = "/api/topic/" + name + "/sub/" + sub + "?render=1&num=" + s_num;
+    } else {
+        var url = "/api/topic/" + name + "/sub/" + sub + "?render=1";
+    }
     var n_data = "";
     var num = 1;
     
@@ -17,7 +21,9 @@ function topic_main_load(name, sub) {
             }
             
             o_data.innerHTML = n_data;
-            topic_plus_load(name, sub, String(Number(num) + 1));
+            if(!s_num) {
+                topic_plus_load(name, sub, String(Number(num) + 1));
+            }
         }
     }
     

+ 1 - 1
views/main_css/js/topic_plus_load.js

@@ -1,6 +1,6 @@
 function topic_plus_load(name, sub, num) {
     var test = setInterval(function() {
-        var url = "/api/topic/" + name + "/sub/" + sub + "?num=" + num + "&render=1";
+        var url = "/api/topic/" + encodeURI(name) + "/sub/" + encodeURI(sub) + "?num=" + num + "&render=1";
         var p_data = document.getElementById("plus_topic");
         var n_data = '';
         var n_num = 1;

+ 1 - 1
views/main_css/js/reload.js → views/main_css/js/topic_reload.js

@@ -1,3 +1,3 @@
-function reload() {
+function topic_reload() {
     location.href.endsWith('#reload') ? location.reload(true) : location.href = '#reload';
 }

+ 1 - 1
views/main_css/js/topic_top_load.js

@@ -1,6 +1,6 @@
 function topic_top_load(name, sub) {
     var o_data = document.getElementById('top_topic');
-    var url = "/api/topic/" + name + "/sub/" + sub + "?top=1&render=1";
+    var url = "/api/topic/" + encodeURI(name) + "/sub/" + encodeURI(sub) + "?top=1&render=1";
     var n_data = "";
     var num = 1;