fix js

route/login_register.py

@@ -119,26 +119,10 @@ def login_register_2(conn):
                     
                     ''' + captcha_get() + '''
                     
-                    <!--
-                    <a href="" id="oauth_google">(Google)</a>     
-                    <hr class="main_hr">
-                    -->
-                    
                     <button type="submit">''' + load_lang('save') + '''</button>
                     
                     ''' + http_warning() + '''
                 </form>
-                <script>
-                    document.getElementById('oauth_google').href = '' +
-                        'https://accounts.google.com/o/oauth2/auth' +
-                        '?client_id=ID' +
-                        '&redirect_uri=' + window.location.origin +
-                        '&response_type=code' +
-                        '&scope=https://www.googleapis.com/auth/userinfo.email' +
-                        '&approval_prompt=force' +
-                        '&access_type=offline' +
-                    '';
-                </script>
             ''',
             menu = [['user', load_lang('return')]]
         ))

route/main_func_setting_external.py

@@ -72,7 +72,7 @@ def main_func_setting_external():
             return easy_minify(flask.render_template(skin_check(),
                 imp = [load_lang('ext_api_req_set'), wiki_set(), wiki_custom(), wiki_css([0, 0])],
                 data = '''
-                    <form method="post" id="main_set_data">
+                    <form method="post" id="opennamu_simple_render">
                         <h2>1. ''' + load_lang('captcha') + '''</h2>
                         <a href="https://www.google.com/recaptcha/">(''' + load_lang('recaptcha') + ''')</a> <a href="https://www.hcaptcha.com/">(''' + load_lang('hcaptcha') + ''')</a>
                         <hr class="main_hr">
@@ -139,7 +139,7 @@ def main_func_setting_external():
                         <hr class="main_hr">
                         <button id="save" type="submit">''' + load_lang('save') + '''</button>
                     </form>
-                    <script>simple_render('main_set_data');</script>
+                    <!-- JS : opennamu_do_render_simple -->
                 ''',
                 menu = [['setting', load_lang('return')]]
             ))

route/main_func_setting_main.py

@@ -118,7 +118,7 @@ def main_func_setting_main(db_set):
             return easy_minify(flask.render_template(skin_check(),
                 imp = [load_lang('main_setting'), wiki_set(), wiki_custom(), wiki_css([0, 0])],
                 data = '''
-                    <form method="post" id="main_set_data">
+                    <form method="post" id="opennamu_simple_render">
                         <h2>1. ''' + load_lang('basic_set') + '''</h2>
                         <span>''' + load_lang('wiki_name') + '''</span>
                         <hr class="main_hr">
@@ -254,7 +254,7 @@ def main_func_setting_main(db_set):
 
                         <button id="save" type="submit">''' + load_lang('save') + '''</button>
                     </form>
-                    <script>simple_render('main_set_data');</script>
+                    <!-- JS : opennamu_do_render_simple -->
                 ''',
                 menu = [['setting', load_lang('return')]]
             ))

route/main_func_setting_phrase.py

@@ -59,7 +59,7 @@ def main_func_setting_phrase():
             return easy_minify(flask.render_template(skin_check(),
                 imp = [load_lang('text_setting'), wiki_set(), wiki_custom(), wiki_css([0, 0])],
                 data = '''
-                    <form method="post" id="main_set_data">
+                    <form method="post" id="opennamu_simple_render">
                         <h2>1. ''' + load_lang('register_text') + ''' (HTML)</h2>
                         <textarea rows="3" name="''' + i_list[0] + '''">''' + html.escape(d_list[0]) + '''</textarea>
 
@@ -131,7 +131,7 @@ def main_func_setting_phrase():
                             <a href="/setting/main">''' + load_lang('approval_question_visible_only_when_approval_on') + '''</a>
                         </li>
                     </ul>
-                    <script>simple_render('main_set_data');</script>
+                    <!-- JS : opennamu_do_render_simple -->
                 ''',
                 menu = [['setting', load_lang('return')]]
             ))

route/main_tool_admin.py

@@ -24,7 +24,7 @@ def main_tool_admin(num = 1, add_2 = ''):
         return easy_minify(flask.render_template(skin_check(),
             imp = [load_lang('admin_tool'), wiki_set(), wiki_custom(), wiki_css([0, 0])],
             data = '''
-                <div id="other_simple_render">
+                <div id="opennamu_simple_render">
                     <h2>1. ''' + load_lang('admin') + '''</h2>
                     <ul class="inside_ul">
                         <li><a href="/manager/2">''' + load_lang('acl_change') + '''</a></li>
@@ -73,10 +73,8 @@ def main_tool_admin(num = 1, add_2 = ''):
                     </ul>
                 </div>
                 <!-- JS : opennamu_do_insert_version -->
-                <script>
-                    do_skin_ver_check();
-                    simple_render('other_simple_render');
-                </script>
+                <!-- JS : opennamu_do_insert_version_skin -->
+                <!-- JS : opennamu_do_render_simple -->
             ''',
             menu = [['other', load_lang('return')]]
         ))

route/main_tool_other.py

@@ -4,7 +4,7 @@ def main_tool_other():
     return easy_minify(flask.render_template(skin_check(),
         imp = [load_lang('other_tool'), wiki_set(), wiki_custom(), wiki_css([0, 0])],
         data = '''
-            <div id="other_simple_render">
+            <div id="opennamu_simple_render">
                 <h2>1. ''' + load_lang('record') + '''</h2>
                 <ul class="inside_ul">
                     <li><a href="/manager/6">''' + load_lang('edit_record') + '''</a></li>
@@ -50,7 +50,7 @@ def main_tool_other():
                     <li><a href="/manager/1">''' + load_lang('admin_tool') + '''</a></li>
                 </ul>
             </div>
-            <script>simple_render('other_simple_render');</script>
+            <!-- JS : opennamu_do_render_simple -->
         ''',
         menu = 0
     ))

route/tool/func.py

@@ -757,7 +757,6 @@ def http_warning():
     return '''
         <div id="opennamu_http_warning_text"></div>
         <span style="display: none;" id="opennamu_http_warning_text_lang">''' + load_lang('http_warning') + '''</span>
-        <script>opennamu_do_warning_text();</script>
     '''
 
 def next_fix(link, num, page, end = 50):
@@ -1040,13 +1039,18 @@ def wiki_css(data):
     data_css_ver = '147'
     
     # Func JS
-    data_css += '<script src="/views/main_css/js/func/func.js?ver=' + data_css_ver + '"></script>'
+    data_css += '<script defer src="/views/main_css/js/func/func.js?ver=' + data_css_ver + '"></script>'
     
-    data_css += '<script defer src="/views/main_css/js/func/version.js?ver=' + data_css_ver + '"></script>'
-    data_css += '<script src="/views/main_css/js/func/http_warning_text.js?ver=' + data_css_ver + '"></script>'
-    data_css += '<script src="/views/main_css/js/func/ie_end_of_life.js?ver=' + data_css_ver + '"></script>'
-    data_css += '<script src="/views/main_css/js/func/shortcut.js?ver=' + data_css_ver + '"></script>'
-    data_css += '<script src="/views/main_css/js/func/user_name_parser.js?ver=' + data_css_ver + '"></script>'
+    data_css += '<script defer src="/views/main_css/js/func/insert_version.js?ver=' + data_css_ver + '"></script>'
+    data_css += '<script defer src="/views/main_css/js/func/insert_user_info.js?ver=' + data_css_ver + '"></script>'
+    data_css += '<script defer src="/views/main_css/js/func/insert_version_skin.js?ver=' + data_css_ver + '"></script>'
+    data_css += '<script defer src="/views/main_css/js/func/insert_http_warning_text.js?ver=' + data_css_ver + '"></script>'
+    
+    data_css += '<script defer src="/views/main_css/js/func/ie_end_of_life.js?ver=' + data_css_ver + '"></script>'
+    data_css += '<script defer src="/views/main_css/js/func/shortcut.js?ver=' + data_css_ver + '"></script>'
+    
+    data_css += '<script defer src="/views/main_css/js/func/render_user_name.js?ver=' + data_css_ver + '"></script>'
+    data_css += '<script defer src="/views/main_css/js/func/render_simple.js?ver=' + data_css_ver + '"></script>'
     
     # Render JS
     data_css += '<script src="/views/main_css/js/render/markdown.js?ver=' + data_css_ver + '"></script>'
@@ -1073,7 +1077,7 @@ def wiki_css(data):
     data_css += '<script src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.5.0/build/highlight.min.js"></script>'
     
     data_css += '<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.15.3/dist/katex.min.css" integrity="sha384-KiWOvVjnN8qwAZbuQyWDIbfCLFhLXNETzBQjA/92pIowpC0d2O3nppDGQVgwd2nB" crossorigin="anonymous">'
-    data_css += '<script defer src="https://cdn.jsdelivr.net/npm/katex@0.15.3/dist/katex.min.js" integrity="sha384-0fdwu/T/EQMsQlrHCCHoH10pkPLlKA1jL5dFyUOvB3lfeT2540/2g6YgSi2BL14p" crossorigin="anonymous"></script>'
+    data_css += '<script src="https://cdn.jsdelivr.net/npm/katex@0.15.3/dist/katex.min.js" integrity="sha384-0fdwu/T/EQMsQlrHCCHoH10pkPLlKA1jL5dFyUOvB3lfeT2540/2g6YgSi2BL14p" crossorigin="anonymous"></script>'
 
     data = data[0:2] + ['', data_css] + data[2:]
 
@@ -2161,7 +2165,7 @@ def re_error(data):
 
     if data == '/ban':
         if ban_check() == 1:
-            end = '<div id="get_user_info"></div><script>load_user_info("' + ip_check() + '");</script>'
+            end = '<div id="opennamu_get_user_info">' + html.escape(ip_check()) + '</div>'
         else:
             end = '<ul class="inside_ul"><li>' + load_lang('authority_error') + '</li></ul>'
 

route/user_info.py

@@ -61,7 +61,7 @@ def user_info(name = ''):
             imp = [load_lang('user_tool'), wiki_set(), wiki_custom(), wiki_css([0, 0])],
             data = '''
                 <h2>''' + load_lang('state') + '''</h2>
-                <div id="get_user_info"></div>
+                <div id="opennamu_get_user_info">''' + html.escape(ip) + '''</div>
                 ''' + login_menu + '''
                 ''' + tool_menu + '''
                 <h2>''' + load_lang('other') + '''</h2>
@@ -72,7 +72,6 @@ def user_info(name = ''):
                     <li><a href="/count/''' + url_pas(ip) + '''">''' + load_lang('count') + '''</a></li>
                 </ul>
                 ''' + admin_menu + '''
-                <script>load_user_info("''' + ip + '''");</script>
             ''',
             menu = 0
         ))

route/user_setting.py

@@ -100,8 +100,7 @@ def user_setting():
                     imp = [load_lang('user_setting'), wiki_set(), wiki_custom(), wiki_css([0, 0])],
                     data = '''
                         <form method="post">
-                            <div id="get_user_info"></div>
-                            <script>load_user_info("''' + ip + '''");</script>
+                            <div id="opennamu_get_user_info">''' + html.escape(ip) + '''</div>
                             <hr class="main_hr">
                             <a href="/change/pw">(''' + load_lang('password_change') + ''')</a>
                             <hr class="main_hr">
@@ -165,8 +164,7 @@ def user_setting():
                     imp = [load_lang('user_setting'), wiki_set(), wiki_custom(), wiki_css([0, 0])],
                     data = '''
                         <form method="post">
-                            <div id="get_user_info"></div>
-                            <script>load_user_info("''' + ip + '''");</script>
+                            <div id="opennamu_get_user_info">''' + html.escape(ip) + '''</div>
                             <hr class="main_hr">
                             <h2>''' + load_lang('main') + '''</h2>
                             <span>''' + load_lang('skin') + '''</span>

route/view_read.py

@@ -66,8 +66,7 @@ def view_read(name = 'Test', doc_rev = 0, doc_from = '', do_type = ''):
             # E
             
             user_doc += '''
-                <div id="get_user_info"></div>
-                <script>load_user_info("''' + user_name + '''");</script>
+                <div id="opennamu_get_user_info">''' + html.escape(user_name) + '''</div>
                 <hr class="main_hr">
             '''
             if name == 'user:' + user_name:

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.5 (stable2) (beta3) (dev29)",
+        "r_ver" : "v3.4.5 (stable2) (beta3) (dev30)",
         "c_ver" : "3500113",
         "s_ver" : "3500110"
     }

views/main_css/js/func/http_warning_text.js → views/main_css/js/func/insert_http_warning_text.js

@@ -1,10 +1,15 @@
 "use strict";
 
 function opennamu_do_warning_text() {
-    if(window.location.protocol !== 'https:') {
+    if(
+        window.location.protocol !== 'https:' &&
+        document.getElementById('opennamu_http_warning_text')
+    ) {
         let http_warning_text = document.getElementById('opennamu_http_warning_text_lang').innerHTML;
-        
+
         document.getElementById('opennamu_http_warning_text').innerHTML = http_warning_text;
         document.getElementById('opennamu_http_warning_text').style.margin = "10px 0px 0px 0px";
     }
-}
+}
+
+opennamu_do_warning_text();

views/main_css/js/func/insert_user_info.js

@@ -0,0 +1,22 @@
+"use strict";
+
+function do_insert_user_info() {
+    if(document.getElementById('opennamu_get_user_info')) {
+        let name = document.getElementById('opennamu_get_user_info').innerHTML;
+        
+        let url = "/api/user_info/" + encodeURI(name) + "?render=1";
+        let xhr = new XMLHttpRequest();
+        xhr.open("GET", url, true);
+        xhr.send(null);
+
+        xhr.onreadystatechange = function() {
+            if(this.readyState === 4 && this.status === 200) {
+                document.getElementById('opennamu_get_user_info').innerHTML = JSON.parse(this.responseText)['data'];
+                
+                opennamu_do_ip_parser();
+            }
+        }
+    }
+}
+
+do_insert_user_info();

views/main_css/js/func/version.js → views/main_css/js/func/insert_version.js

@@ -30,6 +30,7 @@ function opennamu_do_insert_version(
 
 let opennamu_do_insert_version_url = [
     '/manager/1',
+    '/manager',
     '/update'
 ];
 if(opennamu_do_insert_version_url.includes(window.location.pathname)) {

views/main_css/js/func/insert_version_skin.js

@@ -0,0 +1,31 @@
+"use strict";
+
+function opennamu_do_insert_version_skin(
+	dom_name_version
+) {
+    let url = "/api/skin_info?all=true";
+    let xhr = new XMLHttpRequest();
+    xhr.open("GET", url);
+    xhr.send();
+
+    xhr.onreadystatechange = function() {
+        if(this.readyState === 4 && this.status === 200) {
+            var json_data = JSON.parse(this.responseText);
+            for(let key in json_data) {
+                document.getElementById(dom_name_version).innerHTML += '<li>' +
+                    json_data[key]['name'] + ' : ' + json_data[key]['skin_ver'] +
+                    (json_data[key]['lastest_version'] ? ' (' + json_data[key]['lastest_version']['skin_ver'] + ')' : '') +
+                '</li>'
+            }
+        }
+    }
+}
+
+let opennamu_do_insert_version_skin_url = [
+    '/manager/1',
+    '/manager'
+];
+if(opennamu_do_insert_version_skin_url.includes(window.location.pathname)) {
+    console.log('t')
+    opennamu_do_insert_version_skin('ver_send_3');
+}

views/main_css/js/func/render_simple.js

@@ -0,0 +1,80 @@
+"use strict";
+
+function opennamu_do_render_simple(name_ele) {
+    let skin_set_data = document.getElementById(name_ele).innerHTML;
+    
+    // 목차 구현
+    let toc_all_data = '<div id="toc"><span id="toc_title">TOC</span><br>';
+    let split_toc;
+    let toc_data;
+    
+    let i = 1;
+    while(1) {
+        toc_data = skin_set_data.match(/<h[1-6]>([^<>]+)<\/h[1-6]>/);
+        if(toc_data) {
+            split_toc = toc_data[1].match(/^([^ ]+)(.+)/);
+            toc_all_data += '' + 
+                '<br>' +
+                '<span style="margin-left: ' + String(((toc_data[1].match(/\./g) || []).length - 1) * 10) + 'px;">' +
+                    '<a href="#toc_' + String(i) + '">' + split_toc[1] + '</a>' + split_toc[2] +
+                '</span>' +
+            '';
+
+            skin_set_data = skin_set_data.replace(
+                /<(h[1-6])>([^<>]+)<\/h[1-6]>/, 
+                '<$1 id="toc_' + String(i) + '"><a href="#toc">' + split_toc[1] + '</a>' + split_toc[2] + '</$1>'
+            );
+            
+            i += 1;
+        } else {
+            break;
+        }
+    }
+    
+    skin_set_data = toc_all_data + '</div>' + skin_set_data;
+
+    // 각주 구현
+    var note_list = {};
+    var plus_note;
+    
+    i = 1;
+    while(1) {
+        toc_data = skin_set_data.match(/<sup>([^<>]+)<\/sup>/);
+        if(toc_data) {
+            if(!note_list[toc_data[1]]) {
+                note_list[toc_data[1]] = [String(i), 0];
+            } else {
+                note_list[toc_data[1]][1] += 1;
+            }
+
+            if(note_list[toc_data[1]][1] != 0) {
+                plus_note = '_' + String(note_list[toc_data[1]][1]);
+            } else {
+                plus_note = '';
+            }
+            
+            skin_set_data = skin_set_data.replace(
+                /<sup>([^<>]+)<\/sup>/, 
+                '<sup><a id="note_' + note_list[toc_data[1]][0] + plus_note + '" href="#note_' + note_list[toc_data[1]][0] + '_end">$1</a></sup>'
+            );
+            
+            i += 1;
+        } else {
+            break;
+        }
+    }
+    
+    document.getElementById(name_ele).innerHTML = skin_set_data;
+}
+
+let opennamu_do_render_simple_url = [
+    '/manager/1',
+    '/manager',
+    '/other',
+    '/setting/phrase',
+    '/setting/main',
+    '/setting/external'
+];
+if(opennamu_do_render_simple_url.includes(window.location.pathname)) {
+    opennamu_do_render_simple('opennamu_simple_render');
+}

views/main_css/js/func/user_name_parser.js → views/main_css/js/func/render_user_name.js

@@ -88,4 +88,4 @@ function opennamu_do_ip_parser() {
     opennamu_do_user_document_check();
 }
 
-document.addEventListener("DOMContentLoaded", opennamu_do_ip_parser);
+opennamu_do_ip_parser();

views/main_css/js/load_skin_set.js

@@ -473,7 +473,7 @@ function main_css_skin_set() {
         </ul> \
     ';
  
-    simple_render('main_skin_set');
+    opennamu_do_render_simple('main_skin_set');
 }
 
 document.addEventListener("DOMContentLoaded", main_css_skin_load);

views/main_css/js/load_something.js

@@ -1,36 +1,3 @@
-function load_user_info(name) {
-    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) {
-            document.getElementById('get_user_info').innerHTML += JSON.parse(this.responseText)['data'];
-            opennamu_do_ip_parser();
-        }
-    }
-}
-
-function do_skin_ver_check() {
-    var url = "/api/skin_info?all=true";
-    var xhr = new XMLHttpRequest();
-    xhr.open("GET", url, true);
-    xhr.send();
-
-    xhr.onreadystatechange = function() {
-        if(this.readyState === 4 && this.status === 200) {
-            var json_data = JSON.parse(this.responseText);
-            for(var key in json_data) {                
-                document.getElementById('ver_send_3').innerHTML += '<li>' +
-                    json_data[key]['name'] + ' : ' + json_data[key]['skin_ver'] +
-                    (json_data[key]['lastest_version'] ? ' (' + json_data[key]['lastest_version']['skin_ver'] + ')' : '') +
-                '</li>'
-            }
-        }
-    }
-}
-
 function do_twofa_check(init = 0) {
     let twofa_option = document.getElementById('twofa_check_input');
     let twofa_option_num = twofa_option.options.selectedIndex;
@@ -61,66 +28,4 @@ function send_render(i = 0) {
             document.getElementsByClassName('send_content')[i].innerHTML = data;
         }
     }
-}
-
-function simple_render(name_ele) {
-    var skin_set_data = document.getElementById(name_ele).innerHTML;
-    
-    // 목차 구현
-    var toc_all_data = '<div id="toc"><span id="toc_title">TOC</span><br>';
-    var split_toc;
-    var toc_data;
-    i = 1;
-    while(1) {
-        toc_data = skin_set_data.match(/<h[1-6]>([^<>]+)<\/h[1-6]>/);
-        if(toc_data) {
-            split_toc = toc_data[1].match(/^([^ ]+)(.+)/);
-            toc_all_data += '' + 
-                '<br>' +
-                '<span style="margin-left: ' + String(((toc_data[1].match(/\./g) || []).length - 1) * 10) + 'px;">' +
-                    '<a href="#toc_' + String(i) + '">' + split_toc[1] + '</a>' + split_toc[2] +
-                '</span>' +
-            '';
-
-            skin_set_data = skin_set_data.replace(
-                /<(h[1-6])>([^<>]+)<\/h[1-6]>/, 
-                '<$1 id="toc_' + String(i) + '"><a href="#toc">' + split_toc[1] + '</a>' + split_toc[2] + '</$1>'
-            );
-            i += 1;
-        } else {
-            break;
-        }
-    }
-    skin_set_data = toc_all_data + '</div>' + skin_set_data;
-
-    // 각주 구현
-    var note_list = {};
-    var plus_note;
-    i = 1;
-    while(1) {
-        toc_data = skin_set_data.match(/<sup>([^<>]+)<\/sup>/);
-        if(toc_data) {
-            if(!note_list[toc_data[1]]) {
-                note_list[toc_data[1]] = [String(i), 0];
-            } else {
-                note_list[toc_data[1]][1] += 1;
-            }
-
-            if(note_list[toc_data[1]][1] != 0) {
-                plus_note = '_' + String(note_list[toc_data[1]][1]);
-            } else {
-                plus_note = '';
-            }
-            
-            skin_set_data = skin_set_data.replace(
-                /<sup>([^<>]+)<\/sup>/, 
-                '<sup><a id="note_' + note_list[toc_data[1]][0] + plus_note + '" href="#note_' + note_list[toc_data[1]][0] + '_end">$1</a></sup>'
-            );
-            i += 1;
-        } else {
-            break;
-        }
-    }
-    
-    document.getElementById(name_ele).innerHTML = skin_set_data;
 }