2du 4 年 前
コミット
ce222cb5e6

+ 1 - 1
route/api_topic_sub.py

@@ -43,7 +43,7 @@ def api_topic_sub_2(conn, topic_num):
                 "data_pas" : render_set(
                     doc_data = data_v, 
                     data_type = 'api_view',
-                    data_in = i[0],
+                    data_in = 'topic_' + topic_num + '_' + i[0],
                     doc_acl = 0
                 )
             }

+ 1 - 1
route/tool/func.py

@@ -84,7 +84,7 @@ global_wiki_set = {}
 
 global_db_set = ''
 
-data_css_ver = '113'
+data_css_ver = '114'
 data_css = ''
 
 conn = ''

+ 1 - 1
route/topic_close_list.py

@@ -39,7 +39,7 @@ def topic_close_list_2(conn, name):
             <form style="''' + display + '" method="post" action="/thread/' + topic_num + '''">
                 <input placeholder="''' + load_lang('discussion_name') + '''" name="title">
                 <hr class="main_hr">
-                <textarea rows="10" id="content" placeholder="''' + load_lang('content') + '''" name="content"></textarea>
+                <textarea rows="10" id="textarea_edit_view" placeholder="''' + load_lang('content') + '''" name="content"></textarea>
                 <hr class="main_hr">
                 ''' + captcha_get() + (ip_warning() if display == '' else '') + '''
                 <input style="display: none;" name="topic" value="''' + name + '''">

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.5.0-dev (stable1) (beta1) (dev2)",
+        "r_ver" : "v3.5.0-dev (stable1) (beta1) (dev3)",
         "c_ver" : "3500101",
         "s_ver" : "3500101"
     }

+ 4 - 3
views/main_css/js/render_onmark.js

@@ -140,7 +140,7 @@ function do_onmark_text_render(data) {
     return data;
 }
 
-function do_onmark_heading_render(data, name_doc, name_include) {
+function do_onmark_heading_render(data, data_js, name_doc, name_include) {
     var heading_re = /\n(={1,6})(#)? ?([^=]+) ?#?={1,6}\n/;
     var heading_level_all = [0, 0, 0, 0, 0, 0];
     var toc_data = '';
@@ -193,8 +193,8 @@ function do_onmark_heading_render(data, name_doc, name_include) {
         data = data.replace(heading_re, 
             '\n<start_point>' +
             (toc_n === 1 ? '' : '</div>') +
-            '<h' + heading_level + ' id="s-' + heading_level_string_no_end + '">' + 
-                '<a href="#toc" id="' + do_js_safe_change(heading_data_text) + '">' + heading_level_string + '</a> ' + 
+            '<h' + heading_level + ' class="render_heading_text">' + 
+                '<a href="#toc" id="s-' + heading_level_string_no_end + '">' + heading_level_string + '</a> ' + 
                 heading_data_text + 
                 '<a id="edit_load_' + String(toc_n) + '" ' +
                     'style="font-size: 70%;"' +
@@ -1345,6 +1345,7 @@ function do_onmark_render(
     data_js += '' + 
         'get_link_state("' + name_include + '");\n' + 
         'get_file_state("' + name_include + '");\n' + 
+		'get_heading_name();'
     ''
     data_js += 'render_html("' + name_include + 'nowiki_html");\n'
     

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

@@ -52,6 +52,13 @@ function get_link_state(data) {
     }
 }
 
+function get_heading_name() {
+	let heading_name = document.getElementsByClassName('render_heading_text');
+	for(let i = 0; i < heading_name.length; i++) {
+		heading_name[i].id = heading_name[i].innerText.replace(/^([0-9]+\.)+ /, '').replace(/✎ ⊖$/, '');
+	}
+}
+
 function load_image_link(data) {
     data.innerHTML = '' +
         '<img   style="' + data.getAttribute('under_style') + '" ' +