번쩍거림 수정

https://github.com/openNAMU/openNAMU/issues/2075

app.py

@@ -514,9 +514,9 @@ app.route('/xref_page/<int:num>/<everything:name>')(view_xref)
 app.route('/xref_this/<everything:name>', defaults = { 'xref_type' : 2 })(view_xref)
 app.route('/xref_this_page/<int:num>/<everything:name>', defaults = { 'xref_type' : 2 })(view_xref)
 
-app.route('/raw/<everything:name>')(view_raw_document)
-app.route('/raw_acl/<everything:name>', defaults = { 'doc_acl' : 'on' })(view_raw_document)
-app.route('/raw_rev/<int:rev>/<everything:name>')(view_raw_document)
+app.route('/raw/<everything:name>')(view_w_raw)
+app.route('/raw_acl/<everything:name>', defaults = { 'doc_acl' : 'on' })(view_w_raw)
+app.route('/raw_rev/<int:rev>/<everything:name>')(view_w_raw)
 
 app.route('/diff/<int(signed = True):num_a>/<int(signed = True):num_b>/<everything:name>')(view_diff)
 
@@ -525,8 +525,8 @@ app.route('/down/<everything:name>')(view_down)
 app.route('/acl/<everything:name>', methods = ['POST', 'GET'])(view_set)
 
 # everything 다음에 추가 붙은 경우에 대해서 재검토 필요 (진행중)
-app.route('/w_from/<everything:name>', defaults = { 'do_type' : 'from' })(view_read)
-app.route('/w/<everything:name>')(view_read)
+app.route('/w_from/<everything:name>', defaults = { 'do_type' : 'from' })(view_w)
+app.route('/w/<everything:name>')(view_w)
 
 app.route('/random', defaults = { 'db_set' : db_set_str })(view_random)
 

route/__init__.py

@@ -156,8 +156,8 @@ from route.view_set import view_set
 from route.view_diff import view_diff
 from route.view_down import view_down
 from route.view_raw import view_raw
-from route.view_raw_document import view_raw_document
-from route.view_read import view_read
+from route.view_w_raw import view_w_raw
+from route.view_w import view_w
 from route.view_xref import view_xref
 from route.view_random import view_random
 

route/tool/func.py

@@ -1045,7 +1045,7 @@ def wiki_css(data):
     data_css = ''
     data_css_dark = ''
 
-    data_css_ver = '204'
+    data_css_ver = '205'
     data_css_ver = '.cache_v' + data_css_ver
 
     if 'main_css' in global_wiki_set:
@@ -1068,7 +1068,7 @@ def wiki_css(data):
         data_css += '<script src="/views/main_css/js/route/editor.js' + data_css_ver + '"></script>'
         data_css += '<script src="/views/main_css/js/route/render.js' + data_css_ver + '"></script>'
         data_css += '<script src="/views/main_css/js/route/topic.js' + data_css_ver + '"></script>'
-        data_css += '<script src="/views/main_css/js/route/view_raw_document.js' + data_css_ver + '"></script>'
+        data_css += '<script src="/views/main_css/js/route/view.js' + data_css_ver + '"></script>'
         
         # Main CSS
         data_css += '<link rel="stylesheet" href="/views/main_css/css/main.css' + data_css_ver + '">'

route/view_read.py → route/view_w.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def view_read(name = 'Test', do_type = ''):
+def view_w(name = 'Test', do_type = ''):
     with get_db_connect() as conn:
         curs = conn.cursor()
 
@@ -83,10 +83,12 @@ def view_read(name = 'Test', do_type = ''):
         elif re.search(r"^user:([^/]*)", name):
             name_view = name
             doc_type = 'user'
+            user_name = ''
 
             match = re.search(r"^user:([^/]*)", name)
+            if match:
+                user_name = html.escape(match.group(1))
             
-            user_name = html.escape(match.group(1))
             user_doc = ''
             
             # S admin or owner 특수 틀 추가
@@ -163,8 +165,7 @@ def view_read(name = 'Test', do_type = ''):
         end_data = '''
             <div id="opennamu_preview_area">
                 <textarea id="opennamu_editor_doc_name" style="display: none;">''' + html.escape(name) + '''</textarea>
-                <textarea readonly id="opennamu_edit_textarea" class="opennamu_textarea_500"></textarea>
-                <script>opennamu_view_raw_document(render = 'do');</script>
+                <script>opennamu_view_w();</script>
             </div>
         '''
 

route/view_raw_document.py → route/view_w_raw.py

@@ -1,9 +1,7 @@
 from .tool.func import *
 
-def view_raw_document(name = '', rev = '', doc_acl = ''):
+def view_w_raw(name = '', rev = '', doc_acl = ''):
     with get_db_connect() as conn:
-        curs = conn.cursor()
-
         rev_str = str(rev)
 
         sub = '(' + load_lang('raw') + ')'
@@ -19,10 +17,10 @@ def view_raw_document(name = '', rev = '', doc_acl = ''):
             <div id="opennamu_preview_area">
                 <textarea id="opennamu_editor_doc_name" style="display: none;">''' + html.escape(name) + '''</textarea>
                 <textarea id="opennamu_editor_rev" style="display: none;">''' + rev_str + '''</textarea>
-                <button id="opennamu_preview_button" type="button" onclick="opennamu_view_raw_document_preview();">''' + load_lang('preview') + '''</button>
+                <button id="opennamu_preview_button" type="button" onclick="opennamu_view_w_raw_preview();">''' + load_lang('preview') + '''</button>
                 <hr class="main_hr">
                 <textarea readonly id="opennamu_edit_textarea" class="opennamu_textarea_500"></textarea>
-                <script>opennamu_view_raw_document();</script>
+                <script>opennamu_view_w_raw();</script>
             </div>
         '''
         

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.5.0-dev17",
+        "r_ver" : "v3.5.0-dev18",
         "c_ver" : "3500374",
         "s_ver" : "3500113"
     }

views/main_css/js/route/view_raw_document.js → views/main_css/js/route/view.js

@@ -1,6 +1,6 @@
 "use strict";
 
-function opennamu_view_raw_document(render = '') {
+function opennamu_view_w_raw(render = '') {
     let name = "test";
     if(document.getElementById('opennamu_editor_doc_name')) {
         name = document.getElementById('opennamu_editor_doc_name').innerHTML;
@@ -27,13 +27,13 @@ function opennamu_view_raw_document(render = '') {
             }
 
             if(render === 'do') {
-                opennamu_view_raw_document_preview();
+                opennamu_view_w_raw_preview();
             }
         }
     });
 }
 
-function opennamu_view_raw_document_preview() {
+function opennamu_view_w_raw_preview() {
     let name = "test";
     if(document.getElementById('opennamu_editor_doc_name')) {
         name = document.getElementById('opennamu_editor_doc_name').innerHTML;
@@ -45,4 +45,19 @@ function opennamu_view_raw_document_preview() {
     }
 
     opennamu_do_render('opennamu_preview_area', name, data);
+}
+
+function opennamu_view_w() {
+    let name = "test";
+    if(document.getElementById('opennamu_editor_doc_name')) {
+        name = document.getElementById('opennamu_editor_doc_name').innerHTML;
+    }
+
+    fetch("/api/raw/" + opennamu_do_url_encode(name)).then(function(res) {
+        return res.json();
+    }).then(function(data) {
+        if(data["data"]) {
+            opennamu_do_render('opennamu_preview_area', name, data["data"]);
+        }
+    });
 }