Prechádzať zdrojové kódy

add turn off monaco

잉여개발기 (SPDV) 3 rokov pred
rodič
commit
19a8e963cc
5 zmenil súbory, kde vykonal 28 pridanie a 13 odobranie
  1. 4 2
      lang/en-US.json
  2. 2 1
      lang/ko-KR.json
  3. 18 8
      route/edit.py
  4. 1 1
      version.json
  5. 3 1
      views/main_css/js/route/edit.js

+ 4 - 2
lang/en-US.json

@@ -54,7 +54,6 @@
         "open" : "Open",
         "agreement" : "Agreement",
         "template" : "Template",
-        "category" : "Category",
         "file" : "File",
         "writer" : "Writer",
         "editor" : "Editor",
@@ -137,7 +136,6 @@
         "recent_change" : "Recently edit(s)",
         "edit_filter" : "Contents filter",
         "recent_ban" : "Block(s) record",
-        "load" : "Load another document",
         "edit_filter_rule" : "Contents filter rule",
         "move_history" : "History of moveing",
         "other_tool" : "Other tools",
@@ -228,8 +226,12 @@
         "multiple_ban" : "Multiple ban",
     	"dont_move" : "Don't move",
         "file_delete" : "File delete",
+        "_comment_" : "Edit",
+            "load" : "Load another document",
+            "turn_off_monaco" : "Turn off monaco editor",
         "_comment_" : "Render",
             "toc" : "TOC",
+            "category" : "Category",
         "_comment_" : "Search",
             "search_document_name" : "Search document name",
             "search_document_data" : "Search document data",

+ 2 - 1
lang/ko-KR.json

@@ -482,5 +482,6 @@
     "topic_state_change_disagree" : "관리자가 토론의 합의를 파기했습니다.",
     "topic_normal" : "일반",
     "topic_stop" : "중지",
-    "topic_close" : "닫힘"
+    "topic_close" : "닫힘",
+    "turn_off_monaco" : "모나코 에디터 끄기"
 }

+ 18 - 8
route/edit.py

@@ -125,10 +125,7 @@ def edit(name = 'Test', section = 0, do_type = ''):
                 warning_edit += '<hr class="main_hr">'
                 editor_top_text = warning_edit + editor_top_text
     
-            editor_top_text += '' + \
-                '<a href="/edit_filter">(' + load_lang('edit_filter_rule') + ')</a>' + \
-                '<hr class="main_hr">' + \
-            ''
+            editor_top_text += '<a href="/edit_filter">(' + load_lang('edit_filter_rule') + ')</a>'
     
             curs.execute(db_change('select data from other where name = "edit_help"'))
             sql_d = curs.fetchall()
@@ -136,7 +133,6 @@ def edit(name = 'Test', section = 0, do_type = ''):
     
             data = re.sub(r'\n+$', '', data)
             
-            # 이 파트 JS로 이동 예정
             monaco_on = flask.request.cookies.get('main_css_monaco', '0')
             if monaco_on == '1':
                 editor_display = 'style="display: none;"'
@@ -146,7 +142,18 @@ def edit(name = 'Test', section = 0, do_type = ''):
                             data-name="vs/editor/editor.main" 
                             href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.20.0/min/vs/editor/editor.main.min.css">
                     <script src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.20.0/min/vs/loader.min.js"></script>
+                    <script>
+                        function opennamu_edit_turn_off_monaco() {
+                            do_monaco_to_textarea();
+
+                            document.getElementById('opennamu_js_edit_textarea_view').style.display = 'block';
+                            document.getElementById('opennamu_monaco_editor').style.display = 'none';
+                            document.getElementById('opennamu_monaco_editor').remove();
+                        }
+                    </script>
                 '''
+
+                editor_top_text += ' <a href="javascript:opennamu_edit_turn_off_monaco();">(' + load_lang('turn_off_monaco') + ')</a>'
                 
                 if flask.request.cookies.get('main_css_darkmode', '0') == '1':
                     monaco_thema = 'vs-dark'
@@ -156,7 +163,7 @@ def edit(name = 'Test', section = 0, do_type = ''):
                 add_script = '''
                     require.config({ paths: { 'vs': 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.20.0/min/vs' }});
                     require(["vs/editor/editor.main"], function () {
-                        window.editor = monaco.editor.create(document.getElementById('monaco_editor'), {
+                        window.editor = monaco.editor.create(document.getElementById('opennamu_monaco_editor'), {
                             value: document.getElementById('opennamu_js_edit_textarea_view').value,
                             language: 'plaintext',
                             wordWrap: true,
@@ -170,10 +177,13 @@ def edit(name = 'Test', section = 0, do_type = ''):
                 monaco_display = 'style="display: none;"'
                 add_get_file = ''
                 add_script = ''
+
+            if editor_top_text != '':
+                editor_top_text += '<hr class="main_hr">'
     
             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 + '''                    
+                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>
@@ -181,7 +191,7 @@ def edit(name = 'Test', section = 0, do_type = ''):
                         
                         <div>''' + edit_button(monaco_on) + '''</div>
                         
-                        <div id="monaco_editor" class="content" ''' + monaco_display + '''></div>
+                        <div id="opennamu_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">
                         

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.5 (stable2) (beta3) (dev57)",
+        "r_ver" : "v3.4.5 (stable2) (beta3) (dev58)",
         "c_ver" : "3500354",
         "s_ver" : "3500110"
     }

+ 3 - 1
views/main_css/js/route/edit.js

@@ -13,7 +13,9 @@ function do_stop_exit() {
 }
 
 function do_insert_edit_data() {
-    do_monaco_to_textarea();
+    if(document.getElementById('opennamu_monaco_editor')) {
+        do_monaco_to_textarea();
+    }
     
     let get_data = document.getElementById('opennamu_js_edit_textarea_view').value;