2
0
Эх сурвалжийг харах

링크 버그 수정, JS 통폐합

Surplus_Up (2DU) 6 жил өмнө
parent
commit
d19afd022c

+ 1 - 1
route/tool/func.py

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

+ 0 - 29
views/main_css/js/load_include.js

@@ -1,29 +0,0 @@
-function load_include(title, name, p_data) {
-    var o_data = document.getElementById(name);
-
-    var change = '';
-    for(key in p_data) {
-        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();
-    xhr.open("GET", url, true);
-    xhr.send(null);
-
-    xhr.onreadystatechange = function() {
-        if(this.readyState === 4 && this.status === 200) {
-            var o_p_data = JSON.parse(this.responseText);
-            var g_data = o_p_data['data'];
-
-            o_data.innerHTML = g_data;
-
-            js_data = o_p_data['js_data'];
-            js_data = js_data.replace(/<script>/g, '');
-            js_data = js_data.replace(/<\/script>/g, '\n');
-
-            eval(js_data)
-        }
-    }
-}

+ 31 - 1
views/main_css/js/load_namumark.js

@@ -3,7 +3,7 @@ function get_link_state(data, i = 0) {
         var link_data = document.getElementsByClassName(data + 'link_finder')[i];
 
         var xhr = new XMLHttpRequest();
-        xhr.open("GET", link_data.href.replace('/w/', '/api/w/') + "?exist=1", true);
+        xhr.open("GET", link_data.href.replace('/w/', '/api/w/').replace(/#([^#]*)/, '') + "?exist=1", true);
         xhr.send(null);
 
         xhr.onreadystatechange = function() {
@@ -40,4 +40,34 @@ function get_file_state(data, i = 0) {
             }
         }
     }
+}
+
+function load_include(title, name, p_data) {
+    var o_data = document.getElementById(name);
+
+    var change = '';
+    for(key in p_data) {
+        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();
+    xhr.open("GET", url, true);
+    xhr.send(null);
+
+    xhr.onreadystatechange = function() {
+        if(this.readyState === 4 && this.status === 200) {
+            var o_p_data = JSON.parse(this.responseText);
+            var g_data = o_p_data['data'];
+
+            o_data.innerHTML = g_data;
+
+            js_data = o_p_data['js_data'];
+            js_data = js_data.replace(/<script>/g, '');
+            js_data = js_data.replace(/<\/script>/g, '\n');
+
+            eval(js_data)
+        }
+    }
 }