Просмотр исходного кода

버그 수정

https://github.com/openNAMU/openNAMU/issues/2165
잉여개발기 2 лет назад
Родитель
Сommit
94895283ea
3 измененных файлов с 13 добавлено и 16 удалено
  1. 11 14
      route/edit.py
  2. 1 1
      route/main_search_deep.py
  3. 1 1
      version.json

+ 11 - 14
route/edit.py

@@ -28,8 +28,6 @@ def edit_editor(conn, ip, data_main = '', do_type = 'edit', addon = '', name = '
     curs = conn.cursor()
 
     monaco_editor_top = ''
-    editor_display = ''
-    monaco_display = ''
     div = ''
 
     if do_type == 'edit':
@@ -59,21 +57,20 @@ def edit_editor(conn, ip, data_main = '', do_type = 'edit', addon = '', name = '
     monaco_editor_top += '<a href="javascript:opennamu_do_editor_temp_save();">(' + get_lang(conn, 'load_temp_save') + ')</a> <a href="javascript:opennamu_do_editor_temp_save_load();">(' + get_lang(conn, 'load_temp_save_load') + ')</a>'
     monaco_editor_top += '<hr class="main_hr">'
     
-    monaco_editor_top += '<select onclick="do_sync_monaco_and_textarea();" id="opennamu_select_editor" onchange="opennamu_edit_turn_off_monaco();">'
-    monaco_editor_top += '<option value="default">' + get_lang(conn, 'default') + '</option>'
-    monaco_editor_top += '<option value="monaco">' + get_lang(conn, 'monaco_editor') + '</option>'
-    monaco_editor_top += '<option value="new_ide">' + get_lang(conn, 'new_ide') + '</option>'
-    monaco_editor_top += '</select>'
-    
-    
     darkmode = flask.request.cookies.get('main_css_darkmode', '0')
     monaco_thema = 'vs-dark' if darkmode == '1' else ''
     
     monaco_on = get_main_skin_set(conn, flask.session, 'main_css_monaco', ip)
+    editor_display = ['style="display: none;"' for _ in range(3)]
     if monaco_on == 'use':
-        editor_display = 'style="display: none;"'
+        editor_display[1] = ''
     else:
-        monaco_display = 'style="display: none;"'
+        editor_display[0] = ''
+
+    monaco_editor_top += '<select onclick="do_sync_monaco_and_textarea();" id="opennamu_select_editor" onchange="opennamu_edit_turn_off_monaco();">'
+    monaco_editor_top += '<option value="default" ' + ('selected' if editor_display[0] == '' else '') + '>' + get_lang(conn, 'default') + '</option>'
+    monaco_editor_top += '<option value="monaco" ' + ('selected' if editor_display[1] == '' else '') + '>' + get_lang(conn, 'monaco_editor') + '</option>'
+    monaco_editor_top += '</select>'
 
     textarea_size = 'opennamu_textarea_500' if do_type == 'edit' else 'opennamu_textarea_100'
 
@@ -87,9 +84,9 @@ def edit_editor(conn, ip, data_main = '', do_type = 'edit', addon = '', name = '
         
         ''' + div + '''
 
-        <div id="opennamu_monaco_editor" class="''' + textarea_size + '''" ''' + monaco_display + '''></div>
-        <textarea id="opennamu_simplemde" class="''' + textarea_size + '''" ''' + monaco_display + '''></textarea>
-        <textarea id="opennamu_edit_textarea" ''' + editor_display + ''' class="''' + textarea_size + '''" name="content" placeholder="''' + p_text + '''">''' + html.escape(data_main) + '''</textarea>
+        <div id="opennamu_monaco_editor" class="''' + textarea_size + '''" ''' + editor_display[1] + '''></div>
+        <textarea id="opennamu_simplemde" class="''' + textarea_size + '''" ''' + editor_display[2] + '''></textarea>
+        <textarea id="opennamu_edit_textarea" class="''' + textarea_size + '''" ''' + editor_display[0] + ''' name="content" placeholder="''' + p_text + '''">''' + html.escape(data_main) + '''</textarea>
         <hr class="main_hr">
         
         ''' + captcha_get(conn) + ip_warning(conn) + addon + '''

+ 1 - 1
route/main_search_deep.py

@@ -47,7 +47,7 @@ def main_search_deep(db_set, name = 'Test', search_type = 'title', num = 1):
             div += '''
                 <ul class="opennamu_ul">
                     <li>
-                        <a ''' + link_id + ' href="/w/' + url_pas(name) + '">' + html.escape(name) + '''</a>
+                        ''' + get_lang(conn, 'go') + ''' : <a ''' + link_id + ' href="/w/' + url_pas(name) + '">' + html.escape(name) + '''</a>
                     </li>
                 </ul>
                 <ul class="opennamu_ul">

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.5.0-dev99",
+        "r_ver" : "v3.5.0-dev100",
         "c_ver" : "20240426",
         "s_ver" : "20240426"
     }