2du 4 лет назад
Родитель
Сommit
8d62722ea1

+ 36 - 34
route/tool/func.py

@@ -91,9 +91,6 @@ global_wiki_set = {}
 
 global_db_set = ''
 
-data_css_ver = '124'
-data_css = ''
-
 conn = ''
 
 # Func
@@ -870,31 +867,41 @@ def skin_check(set_n = 0):
     
 def wiki_css(data):
     # without_DB
-
-    global data_css
-    global data_css_ver
-
     data += ['' for _ in range(0, 3 - len(data))]
-
-    if data_css == '':
-        for i_data in os.listdir(os.path.join("views", "main_css", "css")):
-            if not i_data in ('sub'):
-                data_css += '<link rel="stylesheet" href="/views/main_css/css/' + i_data + '?ver=' + data_css_ver + '">'
-
-        for i_data in os.listdir(os.path.join("views", "main_css", "js")):
-            if not i_data in ('render', 'route'):
-                data_css += '<script src="/views/main_css/js/' + i_data + '?ver=' + data_css_ver + '"></script>'
+    
+    data_css = ''
+    data_css_ver = '145'
+    
+    # Func JS
+    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/user_name_parser.js?ver=' + data_css_ver + '"></script>'
+    
+    # 레거시 일반 JS
+    data_css += '<script src="/views/main_css/js/load_editor.js?ver=' + data_css_ver + '"></script>'
+    data_css += '<script src="/views/main_css/js/load_skin_set.js?ver=' + data_css_ver + '"></script>'
+    data_css += '<script src="/views/main_css/js/load_something.js?ver=' + data_css_ver + '"></script>'
+    data_css += '<script src="/views/main_css/js/load_topic.js?ver=' + data_css_ver + '"></script>'
+    
+    # 레거시 렌더러 JS
+    data_css += '<script src="/views/main_css/js/render_html.js?ver=' + data_css_ver + '"></script>'
+    data_css += '<script src="/views/main_css/js/render_onmark.js?ver=' + data_css_ver + '"></script>'
+    data_css += '<script src="/views/main_css/js/render_wiki.js?ver=' + data_css_ver + '"></script>'
+    
+    # Main CSS
+    data_css += '<link rel="stylesheet" href="/views/main_css/css/main.css?ver=' + data_css_ver + '">'
                 
     data = data[0:2] + ['', '''
-        <link   rel="stylesheet"
-                href="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.2.0/build/styles/default.min.css">
-        <script src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.2.0/build/highlight.min.js"></script>
-        <link   defer rel="stylesheet"
-                href="https://cdn.jsdelivr.net/npm/katex@0.13.2/dist/katex.min.css"
-                integrity="sha384-Cqd8ihRLum0CCg8rz0hYKPoLZ3uw+gES2rXQXycqnL5pgVQIflxAUDS7ZSjITLb5"
+        <link rel="stylesheet"
+              href="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.5.0/build/styles/default.min.css">
+        <script src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.5.0/build/highlight.min.js"></script>
+        <link   rel="stylesheet" 
+                href="https://cdn.jsdelivr.net/npm/katex@0.15.3/dist/katex.min.css" 
+                integrity="sha384-KiWOvVjnN8qwAZbuQyWDIbfCLFhLXNETzBQjA/92pIowpC0d2O3nppDGQVgwd2nB" 
                 crossorigin="anonymous">
-        <script src="https://cdn.jsdelivr.net/npm/katex@0.13.2/dist/katex.min.js"
-                integrity="sha384-1Or6BdeNQb0ezrmtGeqQHFpppNd7a/gw29xeiSikBbsb44xu3uAo8c7FwbF5jhbd"
+        <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] + data[2:]
 
@@ -902,16 +909,11 @@ def wiki_css(data):
 
 def cut_100(data):
     # without_DB
-
-    data = re.search(r'<pre style="display: none;" id="render_content_load">([^<>]+)<\/pre>', data)
-    if data:
-        data = data.group(1)
-        if len(data) > 100:
-            return data[0:100] + '...'
-        else:
-            return data[0:len(data)]
-    else:
-        return ''
+    
+    data = data.replace('<pre class="render_content_load" id="render_content_load">', '')
+    data = data.replace('</pre>', ' ' * 100)
+    
+    return data[0 : 100]
 
 def wiki_set(num = 1):
     curs = conn.cursor()

+ 2 - 2
route/tool/func_mark.py

@@ -114,7 +114,7 @@ class class_do_render:
             if rep_data == 'namumark':
                 data_in = (data_in + '_') if data_in else ''
                 data_end = [
-                    '<pre style="display: none;" id="' + data_in + 'render_content_load">' + html.escape(doc_data) + '</pre>' + \
+                    '<pre class="render_content_load" id="' + data_in + 'render_content_load">' + html.escape(doc_data) + '</pre>' + \
                     '<div class="render_content" id="' + data_in + 'render_content"></div>', 
                     '''
                         do_onmark_render(
@@ -129,7 +129,7 @@ class class_do_render:
             elif rep_data == 'markdown':
                 data_in = (data_in + '_') if data_in else ''
                 data_end = [
-                    '<pre style="display: none;" id="' + data_in + 'render_content_load">' + html.escape(doc_data) + '</pre>' + \
+                    '<pre class="render_content_load" id="' + data_in + 'render_content_load">' + html.escape(doc_data) + '</pre>' + \
                     '<div class="render_content" id="' + data_in + 'render_content"></div>', 
                     '''
                         do_onmark_render(

+ 4 - 0
views/main_css/css/main.css

@@ -188,6 +188,10 @@ hr {
     line-break: anywhere;
 }
 
+.render_content_load {
+    display: none;
+}
+
 blockquote {
     padding: 15px 40px 15px 15px;
     margin: 15px 0 0;

+ 0 - 0
views/main_css/js/load_new_ie_end_of_life.js → views/main_css/js/func/ie_end_of_life.js


+ 2 - 0
views/main_css/js/load_shortcut.js → views/main_css/js/func/shortcut.js

@@ -1,3 +1,5 @@
+"use strict";
+
 let shortcut_key_list = [];
 document.onkeyup = function(e) {
     delete shortcut_key_list[e.key];

+ 0 - 0
views/main_css/js/load_new_other.js → views/main_css/js/func/user_name_parser.js


+ 8 - 0
views/main_css/js/render/markdown.js

@@ -0,0 +1,8 @@
+"use strict";
+
+function opennamu_render_markdown(
+    doc_data,
+    doc_name
+) {
+    
+}

+ 0 - 0
views/main_css/js/render/markdown.ts


+ 0 - 0
views/main_css/js/render/namumark.ts


+ 8 - 0
views/main_css/js/render/onmark.js

@@ -0,0 +1,8 @@
+"use strict";
+
+function opennamu_render_onmark(
+    doc_data,
+    doc_name
+) {
+    
+}

+ 0 - 9
views/main_css/js/render_markdown.js

@@ -1,9 +0,0 @@
-function do_markdown_render(
-    test_mode = 'test', 
-    name_id = '', 
-    name_include = '', 
-    name_doc = '', 
-    doc_data = ''
-) {
-    
-}

+ 0 - 1
views/main_css/js/render_wiki.js

@@ -104,7 +104,6 @@ function get_file_state_extermal(data, data_exter) {
                 '</a>' +
             '';
         } else {
-            console.log(data_class[key]);
             document.getElementsByClassName(data + 'file_finder')[key].innerHTML = '' +
                 load_image_link(data_class[key], 1) +
             '';

+ 5 - 0
views/main_css/js/route/edit.js

@@ -0,0 +1,5 @@
+"use strict";
+
+function opennamu_route_edit() {
+    
+}

+ 9 - 0
views/main_css/js/route/main_skin_set.js

@@ -0,0 +1,9 @@
+"use strict";
+
+function opennamu_do_main_skin_set() {
+
+}
+
+function opennamu_route_main_skin_set() {
+    
+}

+ 5 - 0
views/main_css/js/route/topic.js

@@ -0,0 +1,5 @@
+"use strict";
+
+function opennamu_route_topic() {
+    
+}