Bläddra i källkod

인클루드 버그 수정

Surplus_Up (2DU) 6 år sedan
förälder
incheckning
d5b331ff26
3 ändrade filer med 4 tillägg och 3 borttagningar
  1. 1 1
      route/api_w.py
  2. 1 1
      route/tool/func.py
  3. 2 1
      views/main_css/js/load_include.js

+ 1 - 1
route/api_w.py

@@ -26,7 +26,7 @@ def api_w_2(conn, name):
                         json_data = include_re.sub('', data[0][0])
                         json_data = category_re.sub('', json_data)
 
-                        get_all_change = re.findall('(@(?:[^@]*)@),([^,]*)(,|$)', flask.request.args.get('change', ''))
+                        get_all_change = re.findall('(@(?:[^@]*)@),([^,]*),', flask.request.args.get('change', ''))
                         for i in get_all_change:
                             json_data = json_data.replace(
                                 i[0].replace('<amp>', '&'), 

+ 1 - 1
route/tool/func.py

@@ -396,7 +396,7 @@ def other2(data):
         data += ['']
 
     req_list = ''
-    main_css_ver = 4
+    main_css_ver = 5
 
     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")):

+ 2 - 1
views/main_css/js/load_include.js

@@ -3,8 +3,9 @@ function load_include(title, name, p_data) {
 
     var change = '';
     for(key in p_data) {
-        change += '@' + p_data[key][0].replace('&', '<amp>') + '@,' + p_data[key][1].replace(',', '<comma>').replace('&', '<amp>') + ''
+        change += '@' + p_data[key][0].replace('&', '<amp>') + '@,' + p_data[key][1].replace(',', '<comma>').replace('&', '<amp>') + ','
     }
+    
     var url = "/api/w/" + encodeURI(title) + "?include=" + name + "&change=" + change;
 
     var xhr = new XMLHttpRequest();