fix bug

route/api_sitemap.py

@@ -19,7 +19,7 @@ def api_sitemap():
             other_count = len_all_data % 30000
 
             for i in range(count + 1):
-                data += '<sitemap><loc>' + domain + 'sitemap_' + str(i) + '.xml</loc></sitemap>\n'
+                data += '<sitemap><loc>' + domain + '/sitemap_' + str(i) + '.xml</loc></sitemap>\n'
 
             data += '' + \
                 '</sitemapindex>' + \
@@ -38,10 +38,10 @@ def api_sitemap():
 
                 if count == i:
                     for x in all_data[30000 * i:]:
-                        data += '<url><loc>' + domain + 'w/' + url_pas(x[0]) + '</loc></url>\n'
+                        data += '<url><loc>' + domain + '/w/' + url_pas(x[0]) + '</loc></url>\n'
                 else:
                     for x in all_data[30000 * i:30000 * (i + 1)]:
-                        data += '<url><loc>' + domain + 'w/' + url_pas(x[0]) + '</loc></url>\n'
+                        data += '<url><loc>' + domain + '/w/' + url_pas(x[0]) + '</loc></url>\n'
 
                 data += '' + \
                     '</urlset>' + \

route/edit.py

@@ -170,62 +170,36 @@ def edit(name = 'Test', section = 0, do_type = ''):
                 monaco_display = 'style="display: none;"'
                 add_get_file = ''
                 add_script = ''
-                
-            curs.execute(db_change("select data from other where name = 'markup'"))
-            markup = curs.fetchall()[0][0]
-            
-            server_set = {
-                'section' : section,
-                'markup' : markup
-             }
     
             return easy_minify(flask.render_template(skin_check(), 
                 imp = [name, wiki_set(), wiki_custom(), wiki_css(['(' + load_lang('edit') + ')', 0])],
-                data =  editor_top_text + add_get_file + '''
-                    <span   id="server_set"
-                            style="display: none;">''' + json.dumps(server_set) + '''</span>
+                data =  editor_top_text + add_get_file + '''                    
                     <form method="post">
+                        <textarea style="display: none;" id="opennamu_js_edit_origin">''' + html.escape(data) + '''</textarea>
+                        <textarea style="display: none;" id="opennamu_js_edit_textarea" name="content"></textarea>
+                        <input style="display: none;" name="ver" value="''' + doc_ver + '''">
+                        
                         <div>''' + edit_button(monaco_on) + '''</div>
-                        <div    id="monaco_editor"
-                                class="content" 
-                                ''' + monaco_display + '''></div>
-                        <textarea   id="textarea_edit_view"
-                                    ''' + editor_display + '''
-                                    class="content"
-                                    placeholder="''' + p_text + '''">''' + html.escape(data) + '''</textarea>
+                        
+                        <div id="monaco_editor" class="content" ''' + monaco_display + '''></div>
+                        <textarea id="opennamu_js_edit_textarea_view" ''' + editor_display + ''' class="content" placeholder="''' + p_text + '''">''' + html.escape(data) + '''</textarea>
                         <hr class="main_hr">
-                        <input  placeholder="''' + load_lang('why') + '''" 
-                                name="send">
-                        <textarea   style="display: none;" 
-                                    id="origin">''' + html.escape(data) + '''</textarea>
-                        <textarea   style="display: none;"
-                                    name="content"
-                                    id="content"></textarea>
-                        <input  style="display: none;" 
-                                name="ver" 
-                                value="''' + doc_ver + '''">
+                        
+                        <input placeholder="''' + load_lang('why') + '''" name="send">
                         <hr class="main_hr">
+                        
                         ''' + captcha_get() + ip_warning() + get_edit_text_bottom_check_box() + get_edit_text_bottom() + '''
-                        <button id="save"
-                                type="submit" 
-                                onclick="
-                                    monaco_to_content(); 
-                                    save_stop_exit();
-                                    section_edit_do();
-                                ">''' + load_lang('save') + '''</button>
-                        <button id="preview" 
-                                type="button" 
-                                onclick="
-                                    monaco_to_content();
-                                    load_preview(\'''' + url_pas(name) + '''\');
-                                ">''' + load_lang('preview') + '''</button>
+                        
+                        <button id="opennamu_js_save" type="submit" onclick="monaco_to_content(); section_edit_do();">''' + load_lang('save') + '''</button>
+                        <button id="opennamu_js_preview" type="button" onclick="monaco_to_content(); load_preview(\'''' + url_pas(name) + '''\');">''' + load_lang('preview') + '''</button>
                     </form>
                     <hr class="main_hr">
+                    
                     <div id="see_preview"></div>
+                    
                     <script>
                         section_edit_init();
                         do_paste_image();
-                        do_not_out();
                         ''' + add_script + '''
                     </script>
                 ''',

route/recent_history_add.py

@@ -41,8 +41,8 @@ def recent_history_add(name = 'Test'):
                         <hr class="main_hr">
                         <input placeholder="''' + load_lang('name') + '''" name="get_ip" type="text">
                         <hr class="main_hr">
-                        <button id="save" type="submit" onclick="go_save_zone = 1;">''' + load_lang('save') + '''</button>
-                        <button id="preview" type="button" onclick="load_preview(\'''' + url_pas(name) + '\')">' + load_lang('preview') + '''</button>
+                        <button id="opennamu_js_save" type="submit">''' + load_lang('save') + '''</button>
+                        <button id="opennamu_js_preview" type="button" onclick="load_preview(\'''' + url_pas(name) + '\')">' + load_lang('preview') + '''</button>
                     </form>
                     <hr class="main_hr">
                     <div id="see_preview"></div>

route/tool/func.py

@@ -1022,7 +1022,7 @@ def wiki_css(data):
     data_css = ''
     data_css_ver = '148'
     
-    # Func JS
+    # Func JS + Defer
     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/insert_version.js?ver=' + data_css_ver + '"></script>'
@@ -1041,6 +1041,9 @@ def wiki_css(data):
     data_css += '<script src="/views/main_css/js/render/markdown.js?ver=' + data_css_ver + '"></script>'
     data_css += '<script src="/views/main_css/js/render/wiki.js?ver=' + data_css_ver + '"></script>'
     
+    # Route JS + Defer
+    data_css += '<script defer src="/views/main_css/js/route/edit.js?ver=' + data_css_ver + '"></script>'
+    
     # Route JS
     data_css += '<script src="/views/main_css/js/route/thread.js?ver=' + data_css_ver + '"></script>'
     

version.json

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

views/main_css/js/load_editor.js

@@ -33,30 +33,7 @@ function do_insert_data(name, data, monaco = 0) {
     }
 }
 
-function monaco_to_content() {
-    try {
-        document.getElementById('textarea_edit_view').value = window.editor.getValue();
-    } catch(e) {}
-}
-
-function do_not_out() {
-    window.addEventListener('DOMContentLoaded', function() {
-        window.onbeforeunload = function() {
-            monaco_to_content();
-            section_edit_do();
-            
-            data = document.getElementById('content').value;
-            origin = document.getElementById('origin').value;
-            if(data !== origin) {
-                return '';
-            }
-        }
-    });
-}
-
-function save_stop_exit() {
-    window.onbeforeunload = function () {}
-}
+// 아직 개편이 더 필요함
 
 function do_paste_image() {
     window.addEventListener('DOMContentLoaded', function() {

views/main_css/js/route/edit.js

@@ -0,0 +1,31 @@
+"use strict";
+
+function do_stop_exit() {
+    window.onbeforeunload = function() {
+        do_monaco_to_textarea();
+        // section_edit_do();
+
+        let data = document.getElementById('opennamu_js_edit_textarea').value;
+        let origin = document.getElementById('opennamu_js_edit_origin').value;
+        console.log([data], [origin]);
+        if(data !== origin) {
+            return '';
+        }
+    }
+}
+
+function do_stop_exit_release() {
+    window.onbeforeunload = function () {}
+}
+
+function do_monaco_to_textarea() {
+    try {
+        document.getElementById('opennamu_js_edit_textarea_view').value = window.editor.getValue();
+    } catch(e) {}
+}
+
+if(document.getElementById('opennamu_js_save')) {
+    console.log('test');
+    do_stop_exit();
+    document.getElementById('opennamu_js_save').onclick = do_stop_exit_release;
+}

views/tenshi/css/dark.css

@@ -44,6 +44,6 @@ html, #main {
     color: white;
 }
 
-button#save {
+button#opennamu_js_save {
     background: #083808;
 }

views/tenshi/css/main.css

@@ -288,7 +288,7 @@ pre, #toc, #cate, #redirect {
 }
 */
 
-#redirect, #cate, #toc, blockquote, button#save, button#preview {
+#redirect, #cate, #toc, blockquote, button#opennamu_js_save, button#opennamu_js_preview {
     border: 0;
     
     padding: 10px;
@@ -296,11 +296,11 @@ pre, #toc, #cate, #redirect {
     box-shadow: 0 2px 4px 0 rgba(0,0,0,0.16), 0 2px 10px 0 rgba(0,0,0,0.12);
 }
 
-button#save {
+button#opennamu_js_save {
     background: #92f7f4;
 }
 
-button#preview {
+button#opennamu_js_preview {
     margin-left: 5px;
 }