add main css func

route/tool/func.py

@@ -84,7 +84,7 @@ if sys.version_info < (3, 6):
 global_lang = {}
 global_wiki_set = {}
 
-data_css_ver = '98'
+data_css_ver = '99'
 data_css = ''
 
 conn = ''
@@ -1659,11 +1659,11 @@ def re_error(data):
             if flask.request.path != '/main_skin_set':
                 title = load_lang('skin_set')
                 tool = [['main_skin_set', load_lang('main_skin_set')]]
-                load_skin_set = '<script>main_css_skin_set();</script>'
+                load_skin_set = ''
             else:
                 title = load_lang('main_skin_set')
                 tool = [['skin_set', load_lang('skin_set')]]
-                load_skin_set = ''
+                load_skin_set = '<script>main_css_skin_set();</script>'
         
             return easy_minify(flask.render_template(skin_check(),
                 imp = [title, wiki_set(1), wiki_custom(), wiki_css([0, 0])],

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.0-stable-01b (beta-01b) (dev-21.08.15-02)",
+        "r_ver" : "v3.4.0-stable-01b (beta-01b) (dev-21.08.16-01)",
         "c_ver" : "3400101",
         "s_ver" : "12"
     }

views/main_css/js/load_skin_set.js

@@ -66,7 +66,7 @@ function main_css_get_post() {
     } else {
         document.cookie = 'main_css_toc_set=0;';
     }
-
+    
     check = document.getElementById('main_css_font_size');
     if(check.value.match(/^[0-9]+$/)) {
         document.cookie = 'main_css_font_size=' + check.value + ';';
@@ -81,6 +81,13 @@ function main_css_get_post() {
         document.cookie = 'main_css_monaco=0;';
     }
     
+    check = document.getElementById('main_css_exter_link');
+    if(check.value === 'self') {
+        document.cookie = 'main_css_exter_link=1;';
+    } else {
+        document.cookie = 'main_css_exter_link=0;';
+    }
+    
     history.go(0);
 }
 
@@ -123,13 +130,6 @@ function main_css_skin_load() {
         }
     }
 
-    if(
-        document.cookie.match(main_css_regex_data('main_css_font_size')) &&
-        document.cookie.match(main_css_regex_data('main_css_font_size'))[1] !== ''
-    ) {
-        head_data.innerHTML += '<style>.all_in_data { font-size: ' + document.cookie.match(main_css_regex_data('main_css_font_size'))[1] + 'px; }</style>';
-    }
-
     if(document.cookie.match(main_css_regex_data('main_css_toc_set'))) {
         if(document.cookie.match(main_css_regex_data('main_css_toc_set'))[1] === '2') {
             head_data.innerHTML += '<style>#auto_toc { display: none; }</style>';
@@ -138,6 +138,13 @@ function main_css_skin_load() {
         }
     }
     
+    if(
+        document.cookie.match(main_css_regex_data('main_css_font_size')) &&
+        document.cookie.match(main_css_regex_data('main_css_font_size'))[1] !== ''
+    ) {
+        head_data.innerHTML += '<style>body, input, textarea { font-size: ' + document.cookie.match(main_css_regex_data('main_css_font_size'))[1] + 'px; }</style>';
+    }
+    
     if(
         document.cookie.match(regex_data('main_css_darkmode')) &&
         document.cookie.match(regex_data('main_css_darkmode'))[1] === '1'
@@ -178,7 +185,9 @@ function main_css_load_lang(name) {
             "clipboard_upload" : "Clipboard upload",
             "only_korean" : "Supported in korean only",
             "except_ie" : "Not supported for Internet Explorer",
-            "use_monaco" : "Use monaco editor"
+            "use_monaco" : "Use monaco editor",
+            "self_tab" : "Current tab",
+            "exter_link_open_method" : "External link"
         }, "ko-KR" : {
             "default" : "기본값",
             "change_to_normal" : "일반 텍스트로 변경",
@@ -207,7 +216,9 @@ function main_css_load_lang(name) {
             "clipboard_upload" : "클립보드 파일 올리기",
             "only_korean" : "한국어로만 지원됨",
             "except_ie" : "인터넷 익스플로러에선 지원되지 않음",
-            "use_monaco" : "모나코 에디터 사용"
+            "use_monaco" : "모나코 에디터 사용",
+            "self_tab" : "현재 탭",
+            "exter_link_open_method" : "외부 링크"
         }
     }
 
@@ -368,12 +379,6 @@ function main_css_skin_set() {
         i += 1;
     }
 
-    if(document.cookie.match(main_css_regex_data('main_css_font_size'))) {
-        set_data["font_size"] = document.cookie.match(main_css_regex_data('main_css_font_size'))[1];
-    } else {
-        set_data["font_size"] = '';
-    }
-
     if(
         document.cookie.match(main_css_regex_data('main_css_monaco')) &&
         document.cookie.match(main_css_regex_data('main_css_monaco'))[1] === '1'
@@ -382,6 +387,28 @@ function main_css_skin_set() {
     } else {
         set_data["monaco"] = "";
     }
+    
+    if(document.cookie.match(main_css_regex_data('main_css_font_size'))) {
+        set_data["font_size"] = document.cookie.match(main_css_regex_data('main_css_font_size'))[1];
+    } else {
+        set_data["font_size"] = '';
+    }
+    
+    let exter_link_list = [
+        ['0', 'blank', main_css_load_lang('default')],
+        ['1', 'self', main_css_load_lang('self_tab')]
+    ];
+    set_data["exter_link"] = '';
+    for(let i = 0; exter_link_list[i]; i++) {
+        if(
+            document.cookie.match(main_css_regex_data('main_css_exter_link')) && 
+            document.cookie.match(main_css_regex_data('main_css_exter_link'))[1] === exter_link_list[i][0]
+        ) {
+            set_data["exter_link"] = '<option value="' + exter_link_list[i][1] + '">' + exter_link_list[i][2] + '</option>' + set_data["exter_link"];
+        } else {
+            set_data["exter_link"] += '<option value="' + exter_link_list[i][1] + '">' + exter_link_list[i][2] + '</option>';
+        }
+    }
 
     document.getElementById("main_skin_set").innerHTML = ' \
         <h2>1. ' + main_css_load_lang('renderer') + '</h2> \
@@ -413,6 +440,10 @@ function main_css_skin_set() {
         </select> \
         <h3>1.8. ' + main_css_load_lang('set_font_size') + '</h3> \
         <input id="main_css_font_size" placeholder="' + main_css_load_lang('font_size') + ' (EX : 11)" value="' + set_data["font_size"] + '"> \
+        <h3>1.9. ' + main_css_load_lang('exter_link_open_method') + '</h3> \
+        <select id="main_css_exter_link"> \
+            ' + set_data["exter_link"] + ' \
+        </select> \
         <h2>2. ' + main_css_load_lang('editor') + '</h2> \
         <h3>2.1. ' + main_css_load_lang('main') + '</h3> \
         <input ' + set_data["monaco"] + ' type="checkbox" id="main_css_monaco" value="monaco"> ' + main_css_load_lang('use_monaco') + '<sup>(1)</sup> \

views/main_css/js/render_namumark.js

@@ -1,9 +1,14 @@
 function get_link_state(data) {
+    let data_exter_link = '0';
+    if(document.cookie.match(main_css_regex_data('main_css_exter_link'))) {
+        data_exter_link = document.cookie.match(main_css_regex_data('main_css_exter_link'))[1];
+    }
+    
     var link_list = [];
     var link_list_2 = {}
     for(var i = 0; document.getElementsByClassName(data + 'link_finder')[i]; i++) {
         var data_class = document.getElementsByClassName(data + 'link_finder')[i];
-        if(!data_class.href.match(/^#/)) {            
+        if(data_class.id !== 'out_link' && !data_class.href.match(/^#/)) {            
             link_list.push(data_class.title);
             
             if(!link_list_2[data_class.title]) {
@@ -11,11 +16,11 @@ function get_link_state(data) {
             } else {
                 link_list_2[data_class.title].push(i);
             }
+        } else if(data_exter_link === '1' && data_class.id === 'out_link') {
+            document.getElementsByClassName(data + 'link_finder')[i].target = '_self';
         }
     }
     
-    console.log(link_list);
-    
     var data_form = new FormData();
     data_form.append('title_list', JSON.stringify(link_list));
     
@@ -24,10 +29,8 @@ function get_link_state(data) {
     xhr.send(data_form);
 
     xhr.onreadystatechange = function() {
-        console.log(this)
         if(this.readyState === 4 && this.status === 200) {
             var data_xhr = JSON.parse(this.responseText);
-            console.log(data_xhr)
             for(var key in link_list_2) {
                 if(!data_xhr[key]) {
                     for(var key_2 in link_list_2[key]) {

views/main_css/js/render_onmark.js

@@ -310,6 +310,7 @@ function do_onmark_link_render(data, data_js, name_doc, name_include, data_nowik
                 }
 
                 return  '<a id="out_link" ' +
+                            'class="' + name_include + 'link_finder" ' +
                             'target="_blank" ' +
                             'name="' + name_include + 'set_link_' + num_link_str + '" ' + 
                             'title=""' +