mode onmark

route/tool/func.py

@@ -65,7 +65,7 @@ for i in range(0, 2):
 
 global_lang = {}
 
-data_css_ver = '77'
+data_css_ver = '78'
 data_css = ''
 
 conn = ''
@@ -160,37 +160,6 @@ def load_random_key(long = 64):
     return ''.join(random.choice("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ") for i in range(long))
 
 def last_change(data):
-    json_address = re.sub(r"(((?!\.|\/).)+)\.html$", "set.json", skin_check())
-    try:
-        json_data = json.loads(open(json_address, encoding='utf8').read())
-    except:
-        json_data = 0
-
-    if json_data != 0:
-        for j_data in json_data:
-            if "class" in json_data[j_data]:
-                if "require" in json_data[j_data]:
-                    re_data = re.compile("<((?:" + j_data + ")( (?:(?!>).)*)?)>")
-                    s_data = re_data.findall(data)
-                    for i_data in s_data:
-                        e_data = 0
-
-                        for j_i_data in json_data[j_data]["require"]:
-                            re_data_2 = re.compile("( |^)" + j_i_data + " *= *[\'\"]" + json_data[j_data]["require"][j_i_data] + "[\'\"]")
-                            if not re_data_2.search(i_data[1]):
-                                re_data_2 = re.compile("( |^)" + j_i_data + "=" + json_data[j_data]["require"][j_i_data] + "(?: |$)")
-                                if not re_data_2.search(i_data[1]):
-                                    e_data = 1
-
-                                    break
-
-                        if e_data == 0:
-                            re_data_3 = re.compile("<" + i_data[0] + ">")
-                            data = re_data_3.sub("<" + i_data[0] + " class=\"" + json_data[j_data]["class"] + "\">", data)
-                else:
-                    re_data = re.compile("<(?P<in>" + j_data + "(?: (?:(?!>).)*)?)>")
-                    data = re_data.sub("<\g<in> class=\"" + json_data[j_data]["class"] + "\">", data)
-
     return data
 
 def easy_minify(data, tool = None):
@@ -300,10 +269,6 @@ def update(ver_num, set_data):
         if get_data and get_data[0][0] == 'master':
             curs.execute(db_change("update other set data = 'beta' where name = 'update'"), [])
 
-    # 캐시 초기화
-    if ver_num < 3206000:
-        curs.execute(db_change('delete from cache_data'))
-
     if ver_num < 3202600:
         curs.execute(db_change("select name, regex, sub from filter"))
         for i in curs.fetchall():
@@ -336,7 +301,11 @@ def update(ver_num, set_data):
             curs.execute(db_change("insert into acl (title, data, type) values (?, ?, ?)"), [i[0], i[2], 'dis'])
             curs.execute(db_change("insert into acl (title, data, type) values (?, ?, ?)"), [i[0], i[3], 'view'])
             curs.execute(db_change("insert into acl (title, data, type) values (?, ?, ?)"), [i[0], i[4], 'why'])
-            
+          
+    # 캐시 초기화
+    if ver_num < 3300101:
+        curs.execute(db_change('delete from cache_data'))
+    
     conn.commit()
 
     print('Update completed')

version.json

@@ -1,7 +1,7 @@
 {
     "beta" : {
-        "r_ver" : "v3.2.0-stable-13 (beta-60) (dev-2021-03-29-01)",
-        "c_ver" : "3206000",
+        "r_ver" : "v3.3.0-stable-01 (beta-01) (dev-2021-04-11-01)",
+        "c_ver" : "3300101",
         "s_ver" : "11"
     }
 }

views/main_css/js/render_namumark.js

@@ -1,16 +1,20 @@
 function get_link_state(data, i = 0) { 
     var get_class = document.getElementsByClassName(data + 'link_finder')[i];
     if(get_class) {
-        var xhr = new XMLHttpRequest();
-        xhr.open("GET", get_class.href.replace('/w/', '/api/w/').replace(/#([^#]*)/, '') + "?exist=1");
-        xhr.send();
+        if(get_class.href.match(/^#/)) {
+            document.getElementsByClassName(data + 'link_finder')[i].id = "";
+        } else {
+            var xhr = new XMLHttpRequest();
+            xhr.open("GET", get_class.href.replace('/w/', '/api/w/').replace(/#([^#]*)/, '') + "?exist=1");
+            xhr.send();
 
-        xhr.onreadystatechange = function() {
-            if(this.readyState === 4 && this.status === 200) {
-                if(JSON.parse(this.responseText)['exist'] !== '1') {
-                    document.getElementsByClassName(data + 'link_finder')[i].id = "not_thing";
-                } else {
-                    document.getElementsByClassName(data + 'link_finder')[i].id = "";
+            xhr.onreadystatechange = function() {
+                if(this.readyState === 4 && this.status === 200) {
+                    if(JSON.parse(this.responseText)['exist'] !== '1') {
+                        document.getElementsByClassName(data + 'link_finder')[i].id = "not_thing";
+                    } else {
+                        document.getElementsByClassName(data + 'link_finder')[i].id = "";
+                    }
                 }
             }
         }

views/main_css/js/render_onmark.js

@@ -129,6 +129,7 @@ function do_onmark_heading_render(data) {
             '\n' +
         ''
         data = data.replace(heading_re, 
+            '\n' +
             '<h' + heading_level + ' id="s-' + heading_level_string_no_end + '">' + 
                 '<a href="#toc">' + heading_level_string + '</a> ' + heading_data[2] + 
             '</h' + heading_level + '>' +
@@ -257,6 +258,17 @@ function do_onmark_link_render(data, data_js, name_doc, name_include, data_nowik
                         'title=""' +
                         'href="">' + link_out + '</a>';
         } else {
+            if(link_real.match(/^\//)) {
+                link_real = name_doc + link_real;
+            } else if(link_real === '../') {
+                link_real = name_doc.split('/');
+                if(link_real.length > 1) {
+                    link_real = link_real.slice(0, link_real.length - 1).join('/');
+                } else {
+                    link_real = name_doc;
+                }
+            }
+            
             var i = 0;
             while(i < 2) {
                 if(i === 0) {
@@ -265,7 +277,11 @@ function do_onmark_link_render(data, data_js, name_doc, name_include, data_nowik
                     var link_sub = link_data_var[1];
                     
                     var var_link_type = 'href';
-                    var var_link_data = '/w/' + do_url_change(link_main) + link_sub;
+                    if(link_main === '') {
+                        var var_link_data = link_sub;
+                    } else {
+                        var var_link_data = '/w/' + do_url_change(link_main) + link_sub;
+                    }
                 } else {
                     var var_link_type = 'title';
                     var var_link_data = do_js_safe_change(link_main) + link_sub;
@@ -664,7 +680,7 @@ function do_onmark_table_render_sub(data, data_col) {
             } else if(table_option_name === 'height') {
                 data_option_all['td'] += 'height:' + table_option_data + ';';
             } else {
-                no_option = '<lt>' + data_option + '<gt>';
+                data_option_all['td'] += 'background:' + table_option_data + ';';
             }
         } else {
             if(data_option.match(/^-[0-9]+$/)) {