Surplus_Up (2DU) 7 лет назад
Родитель
Сommit
2b22ba11b1
5 измененных файлов с 49 добавлено и 50 удалено
  1. 0 2
      route/tool/set_mark/namu.py
  2. 0 1
      route/topic.py
  3. 49 0
      views/main_css/main.js
  4. 0 10
      views/main_css/parser.js
  5. 0 37
      views/main_css/topic_reload.js

+ 0 - 2
route/tool/set_mark/namu.py

@@ -260,8 +260,6 @@ def middle_parser(data, fol_num, syntax_num, folding_num):
                                                             folding_data = ['Test']
 
                                                         if folding_num == 0:
-                                                            plus_data += '<script src="/views/main_css/parser.js"></script>'
-
                                                             folding_num = 1
                                                         
                                                         data = re.sub('{{{#!folding ?((?:(?!\n).)*)\n?', '<div>' + str(folding_data[0]) + ' <div style="display: inline-block;"><a href="javascript:void(0);" onclick="folding(' + str(fol_num) + ');">[do]</a></div_end><div id="folding_' + str(fol_num) + '" style="display: none;"><div id="wiki_div" style="">', data, 1)

+ 0 - 1
route/topic.py

@@ -177,7 +177,6 @@ def topic_2(conn, name, sub):
         if ban != 1 or admin == 1:
             data += '''
                     <div id="plus"></div>
-                    <script type="text/javascript" src="/views/main_css/topic_reload.js"></script>
                     <script>topic_load("''' + name + '''", "''' + sub + '''");</script>
                     <a id="reload" href="javascript:void(0);" onclick="location.href.endsWith(\'#reload\')? location.reload(true):location.href=\'#reload\'">(''' + load_lang('reload') + ''')</a>
                     <form style="''' + display + '''" method="post">

+ 49 - 0
views/main_css/main.js

@@ -7,4 +7,53 @@ function open_foot(name) {
     } else {
         o_data.innerHTML = '';
     }
+}
+
+function topic_load(name, sub) {
+    function addZero(i) {
+        if(i < 10) {
+            i = "0" + i;
+        }
+        
+        return i;
+    }
+
+    setTimeout(function() {
+        var test = setInterval(function() {
+            var d = new Date();
+            d.setSeconds(d.getSeconds() - 3);
+            
+            var date = d.getFullYear() + '-' + addZero(d.getMonth() + 1) + '-' + addZero(d.getDate());
+            date += ' ' + addZero(d.getHours()) + ':' + addZero(d.getMinutes()) + ':' + addZero(d.getSeconds());
+
+            var url = "/api/topic/" + name + "/sub/" + sub + "?time=" + date;
+            var xhr = new XMLHttpRequest();
+            var doc_data = document.getElementById("plus");
+
+            xhr.open("GET", url);
+            xhr.send(null);
+
+            xhr.onreadystatechange = function() {
+                if(this.readyState == XMLHttpRequest.DONE && xhr.status == 200 && xhr.responseText != "{}\n") {
+                    console.log(xhr.responseText);
+                    console.log(url);
+
+                    doc_data.innerText += '(New)\n\n';
+
+                    clearInterval(test);
+                }
+            }
+        }, 3000)
+    }, 4000);
+}
+
+hljs.initHighlightingOnLoad(); 
+
+function folding(num) { 
+    var fol = document.getElementById('folding_' + num); 
+    if(fol.style.display == 'inline-block' || fol.style.display == 'block') { 
+        fol.style.display = 'none';
+    } else {
+        fol.style.display = 'block'; 
+    } 
 }

+ 0 - 10
views/main_css/parser.js

@@ -1,10 +0,0 @@
-hljs.initHighlightingOnLoad(); 
-
-function folding(num) { 
-    var fol = document.getElementById('folding_' + num); 
-    if(fol.style.display == 'inline-block' || fol.style.display == 'block') { 
-        fol.style.display = 'none';
-    } else {
-        fol.style.display = 'block'; 
-    } 
-}

+ 0 - 37
views/main_css/topic_reload.js

@@ -1,37 +0,0 @@
-function topic_load(name, sub) {
-    function addZero(i) {
-        if(i < 10) {
-            i = "0" + i;
-        }
-        
-        return i;
-    }
-
-    setTimeout(function() {
-        var test = setInterval(function() {
-            var d = new Date();
-            d.setSeconds(d.getSeconds() - 3);
-            
-            var date = d.getFullYear() + '-' + addZero(d.getMonth() + 1) + '-' + addZero(d.getDate());
-            date += ' ' + addZero(d.getHours()) + ':' + addZero(d.getMinutes()) + ':' + addZero(d.getSeconds());
-
-            var url = "/api/topic/" + name + "/sub/" + sub + "?time=" + date;
-            var xhr = new XMLHttpRequest();
-            var doc_data = document.getElementById("plus");
-
-            xhr.open("GET", url);
-            xhr.send(null);
-
-            xhr.onreadystatechange = function() {
-                if(this.readyState == XMLHttpRequest.DONE && xhr.status == 200 && xhr.responseText != "{}\n") {
-                    console.log(xhr.responseText);
-                    console.log(url);
-
-                    doc_data.innerText += '(New)\n\n';
-
-                    clearInterval(test);
-                }
-            }
-        }, 3000)
-    }, 4000);
-}