فهرست منبع

버그 수정

Surplus_Up (2DU) 6 سال پیش
والد
کامیت
6b48d58be9
4فایلهای تغییر یافته به همراه12 افزوده شده و 27 حذف شده
  1. 1 1
      route/tool/func.py
  2. 6 16
      route/tool/mark.py
  3. 1 1
      version.json
  4. 4 9
      views/main_css/js/load_topic.js

+ 1 - 1
route/tool/func.py

@@ -499,7 +499,7 @@ def other2(data):
         data += ['']
 
     req_list = ''
-    main_css_ver = 21
+    main_css_ver = 22
 
     if not 'main_css_load' in flask.session or not 'main_css_ver' in flask.session or flask.session['main_css_ver'] != main_css_ver:
         for i_data in os.listdir(os.path.join("views", "main_css", "css")):

+ 6 - 16
route/tool/mark.py

@@ -21,23 +21,13 @@ def send_parser(data):
     if not re.search('^<br>$', data):
         data = html.escape(data)
 
-        javascript = re.compile('javascript:', re.I)
+        data = re.sub('javascript:', '', data, flags = re.I)
+        data = data.replace('&lt;br&gt;', '')
 
-        data = javascript.sub('', data)
-
-        while 1:
-            re_data = re.search('&lt;a(?: (?:(?:(?!&gt;).)*))?&gt;(?P<in>(?:(?!&lt;).)*)&lt;\/a&gt;', data)
-            if re_data:
-                re_data = re_data.groups()[0]
-
-                data = re.sub(
-                    '&lt;a(?: (?:(?:(?!&gt;).)*))?&gt;(?P<in>(?:(?!&lt;).)*)&lt;\/a&gt;', 
-                    '<a href="/w/' + urllib.parse.quote(re_data).replace('/','%2F') + '">' + re_data + '</a>', 
-                    data, 
-                    1
-                )
-            else:
-                break
+    link_re = re.compile('&lt;a(?: (?:(?:(?!&gt;).)*))?&gt;(?P<in>(?:(?!&lt;).)*)&lt;\/a&gt;')
+    link_data = link_re.findall(data)
+    for i in link_data:
+        data = link_re.sub('<a href="/w/' + urllib.parse.quote(i).replace('/','%2F') + '">' + i + '</a>', data, 1)
 
     return data
 

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.1.7-master-30",
+        "r_ver" : "v3.1.7-master-31",
         "c_ver" : "3172800",
         "s_ver" : "8"
     }, "stable" : {

+ 4 - 9
views/main_css/js/load_topic.js

@@ -50,12 +50,7 @@ function topic_plus_load(topic_num, num) {
                 eval(t_plus_data);
 
                 // https://programmingsummaries.tistory.com/379
-                var options = {
-                    body: '#' + n_num
-                }
-
-                var notification = new Notification("openNAMU", options);
-
+                var notification = new Notification("openNAMU", { body: '#' + n_num });
                 setTimeout(function () {
                     notification.close();
                 }, 5000);
@@ -64,7 +59,7 @@ function topic_plus_load(topic_num, num) {
                 clearInterval(test);
             }
         }
-    }, 2000);
+    }, 5000);
 }
 
 function topic_main_load(topic_num, s_num) {
@@ -82,8 +77,8 @@ function topic_main_load(topic_num, s_num) {
     xhr.send(null);
 
     xhr.onreadystatechange = function() {
-        if(xhr.readyState === 4 && xhr.status === 200) {
-            var t_data = JSON.parse(xhr.responseText);
+        if(this.readyState === 4 && this.status === 200) {
+            var t_data = JSON.parse(this.responseText);
             var t_plus_data = '';
 
             for(var key in t_data) {