Surplus_Up (2DU) před 6 roky
rodič
revize
553670cb66

+ 3 - 2
route/tool/func.py

@@ -495,7 +495,8 @@ def other2(data):
         req_list = flask.session['main_css_load']
 
     data = data[0:2] + ['', '''
-        <link   rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.18.1/styles/default.min.css">
+        <link   rel="stylesheet"
+                href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.18.1/styles/default.min.css">
         <link   rel="stylesheet"
                 href="https://cdn.jsdelivr.net/npm/katex@0.10.1/dist/katex.min.css"
                 integrity="sha384-dbVIfZGuN1Yq7/1Ocstc1lUEm+AT+/rCkibIcC/OmWo5f0EA48Vf8CytHzGrSwbQ"
@@ -504,7 +505,7 @@ def other2(data):
                 integrity="sha384-2BKqo+exmr9su6dir+qCw08N2ZKRucY4PrGQPPWU1A7FtlCGjmEGFqXCv5nyM5Ij"
                 crossorigin="anonymous"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.18.1/highlight.min.js"></script>
-    ''' + req_list + '<script>main_css_skin_load();</script>'] + data[2:]
+    ''' + req_list + '<script>window.addEventListener(\'DOMContentLoaded\', function() { main_css_skin_load(); });</script>'] + data[2:]
 
     return data
 

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.1.8-master-34",
+        "r_ver" : "v3.1.8-master-35",
         "c_ver" : "3183000",
         "s_ver" : "8"
     }, "stable" : {

+ 15 - 19
views/main_css/js/load_namumark.js

@@ -1,11 +1,13 @@
 function get_link_state(data, i = 0) { 
     if(document.getElementsByClassName(data + 'link_finder')[i]) {
-        var link_data = document.getElementsByClassName(data + 'link_finder')[i];
-        
         get_link_state(data, i + 1);
 
         var xhr = new XMLHttpRequest();
-        xhr.open("GET", link_data.href.replace('/w/', '/api/w/').replace(/#([^#]*)/, '') + "?exist=1", true);
+        xhr.open(
+            "GET", 
+            document.getElementsByClassName(data + 'link_finder')[i].href.replace('/w/', '/api/w/').replace(/#([^#]*)/, '') + "?exist=1", 
+            true
+        );
         xhr.send(null);
 
         xhr.onreadystatechange = function() {
@@ -21,13 +23,15 @@ function get_link_state(data, i = 0) {
 }
 
 function get_file_state(data, i = 0) {       
-    if(document.getElementsByClassName(data + 'file_finder_1')[i]) {
-        var file_data = document.getElementsByClassName(data + 'file_finder_1')[i];
-        
+    if(document.getElementsByClassName(data + 'file_finder_1')[i]) {        
         get_file_state(data, i + 1);
 
         var xhr = new XMLHttpRequest();
-        xhr.open("GET", file_data.src.replace('/image/', '/api/image/'), true);
+        xhr.open(
+            "GET", 
+            document.getElementsByClassName(data + 'file_finder_1')[i].src.replace('/image/', '/api/image/'), 
+            true
+        );
         xhr.send(null);
         
         xhr.onreadystatechange = function() {
@@ -43,8 +47,6 @@ 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>') + ','
@@ -59,15 +61,11 @@ function load_include(title, name, p_data) {
     xhr.onreadystatechange = function() {
         if(this.readyState === 4 && this.status === 200) {
             if(this.responseText === "{}\n") {
-                o_data.innerHTML = "";
-
+                document.getElementById(name).innerHTML = "";
                 document.getElementsByClassName(name)[0].id = "not_thing";
             } else {
                 var o_p_data = JSON.parse(this.responseText);
-                
-                var g_data = o_p_data['data'];
-                o_data.innerHTML = g_data;
-
+                document.getElementById(name).innerHTML = o_p_data['data'];
                 eval(o_p_data['js_data']);
             }
         }
@@ -75,8 +73,6 @@ function load_include(title, name, p_data) {
 }
 
 function page_count() {
-    var n_ver = document.getElementsByClassName('all_page_count');
-
     var url = "/api/title_index";
 
     var xhr = new XMLHttpRequest();
@@ -87,8 +83,8 @@ function page_count() {
         if(this.readyState === 4 && this.status === 200) {
             var i = 0;
             while(1) {
-                if(n_ver[i]) {
-                    n_ver[i].innerHTML = JSON.parse(this.responseText)['count'];
+                if(document.getElementsByClassName('all_page_count')[i]) {
+                    document.getElementsByClassName('all_page_count')[i].innerHTML = JSON.parse(this.responseText)['count'];
                     i += 1;
                 } else {
                     break;

+ 2 - 5
views/main_css/js/load_preview.js

@@ -1,9 +1,6 @@
 function load_preview(name) {
-    var o_data = document.getElementById('content');
-    var p_data = document.getElementById('see_preview');
-
     var s_data = new FormData();
-    s_data.append('data', o_data.value);
+    s_data.append('data', document.getElementById('content').value);
 
     var url = "/api/w/" + name;
     var url_2 = "/api/markup";
@@ -19,7 +16,7 @@ function load_preview(name) {
     xhr.onreadystatechange = function() {
         if(xhr.readyState === 4 && xhr.status === 200) {
             var o_p_data = JSON.parse(xhr.responseText);
-            p_data.innerHTML = o_p_data['data'];
+            document.getElementById('see_preview').innerHTML = o_p_data['data'];
             eval(o_p_data['js_data'])
         }
     }

+ 1 - 4
views/main_css/js/load_raw_preview.js

@@ -1,6 +1,3 @@
 function load_raw_preview(name_1, name_2) {
-    var get = document.getElementById(name_1);
-    var send = document.getElementById(name_2);
-
-    send.innerHTML = get.value;
+    document.getElementById(name_2).innerHTML = document.getElementById(name_1).value;
 }

+ 124 - 128
views/main_css/js/load_skin_set.js

@@ -1,3 +1,7 @@
+function main_css_regex_data(data) {
+    return new RegExp('(?:^|; )' + data + '=([^;]*)');
+}
+
 function main_css_get_post() {    
     var check = document.getElementById('strike');
     if(check.value === 'normal') {
@@ -76,151 +80,143 @@ function main_css_skin_load() {
     }
 }
 
-function main_css_regex_data(data) {
-    return new RegExp('(?:^|; )' + data + '=([^;]*)');
-}
-
 function main_css_skin_set() {    
-    if(window.location.pathname === '/main_skin_set') {
-        var set_language = {
-            "en-US" : {
-                "default" : "Default",
-                "change_to_normal" : "Change to normal text",
-                "delete" : "Delete",
-                "include_link" : "Using include link",
-                "save" : "Save",
-                "strike" : "Strike",
-                "bold" : "Bold",
-                "other" : "Other",
-                "where_category" : "Set category location",
-                "bottom" : "Bottom",
-                "top" : "Top"
-            }, "ko-KR" : {
-                "default" : "기본값",
-                "change_to_normal" : "일반 텍스트로 변경",
-                "delete" : "삭제",
-                "include_link" : "틀 링크 사용",
-                "save" : "저장",
-                "strike" : "취소선",
-                "bold" : "볼드체",
-                "other" : "기타",
-                "where_category" : "분류 위치 설정",
-                "bottom" : "아래",
-                "top" : "위"
-            }
+    var set_language = {
+        "en-US" : {
+            "default" : "Default",
+            "change_to_normal" : "Change to normal text",
+            "delete" : "Delete",
+            "include_link" : "Using include link",
+            "save" : "Save",
+            "strike" : "Strike",
+            "bold" : "Bold",
+            "other" : "Other",
+            "where_category" : "Set category location",
+            "bottom" : "Bottom",
+            "top" : "Top"
+        }, "ko-KR" : {
+            "default" : "기본값",
+            "change_to_normal" : "일반 텍스트로 변경",
+            "delete" : "삭제",
+            "include_link" : "틀 링크 사용",
+            "save" : "저장",
+            "strike" : "취소선",
+            "bold" : "볼드체",
+            "other" : "기타",
+            "where_category" : "분류 위치 설정",
+            "bottom" : "아래",
+            "top" : "위"
         }
+    }
 
-        var language = document.cookie.match(main_css_regex_data('language'))[1];
-        var user_language = document.cookie.match(main_css_regex_data('user_language'))[1];
-        if(user_language in set_language) {
-            language = user_language;
-        }
+    var language = document.cookie.match(main_css_regex_data('language'))[1];
+    var user_language = document.cookie.match(main_css_regex_data('user_language'))[1];
+    if(user_language in set_language) {
+        language = user_language;
+    }
 
-        if(!language in set_language) {
-            language = "en-US";
-        }
+    if(!language in set_language) {
+        language = "en-US";
+    }
 
-        var data = document.getElementById("main_skin_set");
-        var set_data = {};
-
-        var strike_list = [
-            ['0', 'normal', set_language[language]['default']],
-            ['1', 'change', set_language[language]['change_to_normal']],
-            ['2', 'delete', set_language[language]['delete']]
-        ];
-        set_data["strike"] = '';
-        var i = 0;
-        while(1) {
-            if(strike_list[i]) {
-                if(
-                    document.cookie.match(main_css_regex_data('main_css_del_strike')) && 
-                    document.cookie.match(main_css_regex_data('main_css_del_strike'))[1] === strike_list[i][0]
-                ) {
-                    set_data["strike"] = '<option value="' + strike_list[i][1] + '">' + strike_list[i][2] + '</option>' + set_data["strike"];
-                } else {
-                    set_data["strike"] += '<option value="' + strike_list[i][1] + '">' + strike_list[i][2] + '</option>';
-                }
-
-                i += 1;
+    var set_data = {};
+    var strike_list = [
+        ['0', 'normal', set_language[language]['default']],
+        ['1', 'change', set_language[language]['change_to_normal']],
+        ['2', 'delete', set_language[language]['delete']]
+    ];
+    set_data["strike"] = '';
+    var i = 0;
+    while(1) {
+        if(strike_list[i]) {
+            if(
+                document.cookie.match(main_css_regex_data('main_css_del_strike')) && 
+                document.cookie.match(main_css_regex_data('main_css_del_strike'))[1] === strike_list[i][0]
+            ) {
+                set_data["strike"] = '<option value="' + strike_list[i][1] + '">' + strike_list[i][2] + '</option>' + set_data["strike"];
             } else {
-                break;
+                set_data["strike"] += '<option value="' + strike_list[i][1] + '">' + strike_list[i][2] + '</option>';
             }
+
+            i += 1;
+        } else {
+            break;
         }
+    }
 
-        var bold_list = [
-            ['0', 'normal', set_language[language]['default']],
-            ['1', 'change', set_language[language]['change_to_normal']],
-            ['2', 'delete', set_language[language]['delete']]
-        ];
-        set_data["bold"] = '';
-        var i = 0;
-        while(1) {
-            if(bold_list[i]) {
-                if(
-                    document.cookie.match(main_css_regex_data('main_css_del_bold')) && 
-                    document.cookie.match(main_css_regex_data('main_css_del_bold'))[1] === bold_list[i][0]
-                ) {
-                    set_data["bold"] = '<option value="' + bold_list[i][1] + '">' + bold_list[i][2] + '</option>' + set_data["bold"];
-                } else {
-                    set_data["bold"] += '<option value="' + bold_list[i][1] + '">' + bold_list[i][2] + '</option>';
-                }
-
-                i += 1;
+    var bold_list = [
+        ['0', 'normal', set_language[language]['default']],
+        ['1', 'change', set_language[language]['change_to_normal']],
+        ['2', 'delete', set_language[language]['delete']]
+    ];
+    set_data["bold"] = '';
+    var i = 0;
+    while(1) {
+        if(bold_list[i]) {
+            if(
+                document.cookie.match(main_css_regex_data('main_css_del_bold')) && 
+                document.cookie.match(main_css_regex_data('main_css_del_bold'))[1] === bold_list[i][0]
+            ) {
+                set_data["bold"] = '<option value="' + bold_list[i][1] + '">' + bold_list[i][2] + '</option>' + set_data["bold"];
             } else {
-                break;
+                set_data["bold"] += '<option value="' + bold_list[i][1] + '">' + bold_list[i][2] + '</option>';
             }
-        }
 
-        if(
-            document.cookie.match(main_css_regex_data('main_css_include_link')) &&
-            document.cookie.match(main_css_regex_data('main_css_include_link'))[1] === '1'
-        ) {
-            set_data["include"] = "checked";
+            i += 1;
+        } else {
+            break;
         }
+    }
 
-        var category_list = [
-            ['0', 'bottom', set_language[language]['bottom']],
-            ['1', 'top', set_language[language]['top']],
-        ];
-        set_data["category"] = '';
-        var i = 0;
-        while(1) {
-            if(category_list[i]) {
-                if(
-                    document.cookie.match(main_css_regex_data('main_css_category_set')) && 
-                    document.cookie.match(main_css_regex_data('main_css_category_set'))[1] === category_list[i][0]
-                ) {
-                    set_data["category"] = '<option value="' + category_list[i][1] + '">' + category_list[i][2] + '</option>' + set_data["category"];
-                } else {
-                    set_data["category"] += '<option value="' + category_list[i][1] + '">' + category_list[i][2] + '</option>';
-                }
-
-                i += 1;
+    if(
+        document.cookie.match(main_css_regex_data('main_css_include_link')) &&
+        document.cookie.match(main_css_regex_data('main_css_include_link'))[1] === '1'
+    ) {
+        set_data["include"] = "checked";
+    }
+
+    var category_list = [
+        ['0', 'bottom', set_language[language]['bottom']],
+        ['1', 'top', set_language[language]['top']],
+    ];
+    set_data["category"] = '';
+    var i = 0;
+    while(1) {
+        if(category_list[i]) {
+            if(
+                document.cookie.match(main_css_regex_data('main_css_category_set')) && 
+                document.cookie.match(main_css_regex_data('main_css_category_set'))[1] === category_list[i][0]
+            ) {
+                set_data["category"] = '<option value="' + category_list[i][1] + '">' + category_list[i][2] + '</option>' + set_data["category"];
             } else {
-                break;
+                set_data["category"] += '<option value="' + category_list[i][1] + '">' + category_list[i][2] + '</option>';
             }
+
+            i += 1;
+        } else {
+            break;
         }
+    }
 
 
-        data.innerHTML = ' \
-            <h2>' + set_language[language]['strike'] + '</h2> \
-            <hr class="main_hr"> \
-            <select id="strike" name="strike"> \
-                ' + set_data["strike"] + ' \
-            </select> \
-            <h2>' + set_language[language]['bold'] + '</h2> \
-            <select id="bold" name="bold"> \
-                ' + set_data["bold"] + ' \
-            </select> \
-            <h2>' + set_language[language]['where_category'] + '</h2> \
-            <select id="category" name="category"> \
-                ' + set_data["category"] + ' \
-            </select> \
-            <hr class="main_hr"> \
-            <h2>' + set_language[language]['other'] + '</h2> \
-            <input ' + set_data["include"] + ' type="checkbox" id="include" name="include" value="include"> ' + set_language[language]['include_link'] + ' \
-            <hr class="main_hr"> \
-            <button onclick="main_css_get_post();">' + set_language[language]['save'] + '</button> \
-        ';
-    }
+    document.getElementById("main_skin_set").innerHTML = ' \
+        <h2>' + set_language[language]['strike'] + '</h2> \
+        <hr class="main_hr"> \
+        <select id="strike" name="strike"> \
+            ' + set_data["strike"] + ' \
+        </select> \
+        <h2>' + set_language[language]['bold'] + '</h2> \
+        <select id="bold" name="bold"> \
+            ' + set_data["bold"] + ' \
+        </select> \
+        <h2>' + set_language[language]['where_category'] + '</h2> \
+        <select id="category" name="category"> \
+            ' + set_data["category"] + ' \
+        </select> \
+        <hr class="main_hr"> \
+        <h2>' + set_language[language]['other'] + '</h2> \
+        <input ' + set_data["include"] + ' type="checkbox" id="include" name="include" value="include"> ' + set_language[language]['include_link'] + ' \
+        <hr class="main_hr"> \
+        <button onclick="main_css_get_post();">' + set_language[language]['save'] + '</button> \
+    ';
 }

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

@@ -1,5 +1,4 @@
 function topic_list_load(topic_num, s_num, where) {
-    var o_data = document.getElementById(where);
     var url = "/api/thread/" + String(topic_num) + "?render=1&num=" + String(s_num);
     var n_data = "";
 
@@ -17,7 +16,7 @@ function topic_list_load(topic_num, s_num, where) {
                 t_plus_data += t_data[key]['plus_data'];
             }
 
-            o_data.innerHTML = n_data;
+            document.getElementById(where).innerHTML = n_data;
             eval(t_plus_data);
         }
     }
@@ -26,7 +25,6 @@ function topic_list_load(topic_num, s_num, where) {
 function topic_plus_load(topic_num, num) {
     var test = setInterval(function() {
         var url = "/api/thread/" + String(topic_num) + "?num=" + num + "&render=1";
-        var p_data = document.getElementById("plus_topic");
         var n_data = '';
         var n_num = 1;
 
@@ -46,7 +44,7 @@ function topic_plus_load(topic_num, num) {
                     t_plus_data += t_data[key]['plus_data'];
                 }
 
-                p_data.innerHTML += n_data;
+                document.getElementById("plus_topic").innerHTML += n_data;
                 eval(t_plus_data);
 
                 topic_plus_load(topic_num, String(Number(num) + 1));
@@ -57,7 +55,6 @@ function topic_plus_load(topic_num, num) {
 }
 
 function topic_main_load(topic_num, s_num) {
-    var o_data = document.getElementById('main_topic');
     if(s_num) {
         var url = "/api/thread/" + String(topic_num) + "?render=1&num=" + s_num;
     } else {
@@ -82,7 +79,7 @@ function topic_main_load(topic_num, s_num) {
                 t_plus_data += t_data[key]['plus_data'];
             }
 
-            o_data.innerHTML = n_data;
+            document.getElementById('main_topic').innerHTML = n_data;
             eval(t_plus_data);
             if(window.location.search === "?where=bottom") {
                 document.getElementById(num).focus();
@@ -96,7 +93,6 @@ function topic_main_load(topic_num, s_num) {
 }
 
 function topic_top_load(topic_num) {
-    var o_data = document.getElementById('top_topic');
     var url = "/api/thread/" + String(topic_num) + "?top=1&render=1";
     var n_data = "";
     var num = 1;
@@ -117,7 +113,7 @@ function topic_top_load(topic_num) {
                 t_plus_data += t_data[key]['plus_data'];
             }
 
-            o_data.innerHTML = n_data;
+            document.getElementById('top_topic').innerHTML = n_data;
             eval(t_plus_data);
 
             topic_main_load(topic_num, null);

+ 1 - 4
views/main_css/js/load_user_info.js

@@ -1,15 +1,12 @@
 function load_user_info(name) {
-    var n_ver = document.getElementById('get_user_info');
-
     var url = "/api/user_info/" + encodeURI(name) + "?render=1";
-
     var xhr = new XMLHttpRequest();
     xhr.open("GET", url, true);
     xhr.send(null);
 
     xhr.onreadystatechange = function() {
         if(this.readyState === 4 && this.status === 200) {
-            n_ver.innerHTML += JSON.parse(this.responseText)['data'];
+            document.getElementById('get_user_info').innerHTML += JSON.parse(this.responseText)['data'];
         }
     }
 }

+ 2 - 5
views/main_css/js/load_ver.js

@@ -1,16 +1,13 @@
 function load_ver() {
-    var n_ver = document.getElementById('ver_send');
-
     var url = "/api/version";
-
     var xhr = new XMLHttpRequest();
     xhr.open("GET", url, true);
     xhr.send(null);
 
     xhr.onreadystatechange = function() {
         if(this.readyState === 4 && this.status === 200) {
-            n_ver.innerHTML += JSON.parse(this.responseText)['lastest_version'];
-            n_ver.style.display = "list-item";
+            document.getElementById('ver_send').innerHTML += JSON.parse(this.responseText)['lastest_version'];
+            document.getElementById('ver_send').style.display = "list-item";
         }
     }
 }

+ 1 - 3
views/marisa/js/main.js

@@ -23,14 +23,12 @@ function opening(data) {
 }
 
 document.onclick = function(event) {
-    var element = document.getElementById(save_data);
-
     for(var node = event.target; node != document.body; node = node.parentNode) {
         if(save_data !== '' && open == 0) {
             if(node.id === save_data) {
                 break;
             } else {
-                element.style.display = 'none';
+                document.getElementById(save_data).style.display = 'none';
             }
         }
     }

+ 1 - 2
views/marisa/js/skin_set.js

@@ -47,7 +47,6 @@ function skin_set() {
             language = "en-US";
         }
 
-        var data = document.getElementById("main_skin_set");
         var set_data = {};
 
         if(
@@ -57,7 +56,7 @@ function skin_set() {
             set_data["invert"] = "checked";
         }
 
-        data.innerHTML = ' \
+        document.getElementById("main_skin_set").innerHTML = ' \
             <input ' + set_data["invert"] + ' type="checkbox" id="invert" name="invert" value="invert"> ' + set_language[language]['darkmode'] + ' \
             <hr class="main_hr"> \
             <button onclick="get_post();">' + set_language[language]['save'] + '</button> \