Merge pull request #1279 from openNAMU/dev

Dev

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.5.0-dev (stable1) (beta10) (dev13)",
+        "r_ver" : "v3.5.0-dev (stable1) (beta10) (dev14)",
         "c_ver" : "3500101",
         "s_ver" : "3500110"
     }

views/main_css/js/render_onmark.js

@@ -503,7 +503,7 @@ function do_onmark_footnote_render(data, name_include) {
             
             footnote_end_data += '' +
                 '<li>' +
-                    '<a href="javascript:do_open_foot(\'' + name_include + 'fn-' + String(i) + '\', 1);" ' +
+                    '<a href="javascript:do_open_foot(\'' + name_include + '\', \'fn-' + String(i) + '\', 1);" ' +
                         'id="' + name_include + 'cfn-' + String(i) + '">' +
                         '(' + footnote_name + ')' +
                     '</a> <span id="' + name_include + 'fn-' + String(i) + '">' + footnote_line_data + '</span>' +
@@ -511,7 +511,7 @@ function do_onmark_footnote_render(data, name_include) {
             '';
             data = data.replace(footnote_re, '' +
                 '<sup>' +
-                    '<a href="javascript:do_open_foot(\'' + name_include + 'fn-' + String(i) + '\', 0);" ' +
+                    '<a href="javascript:do_open_foot(\'' + name_include + '\', \'fn-' + String(i) + '\', 0);" ' +
                         'id="' + name_include + 'rfn-' + String(i) + '">' +
                         '(' + footnote_name + ')' +
                     '</a>' +
@@ -529,7 +529,7 @@ function do_onmark_footnote_render(data, name_include) {
         }
     }
     
-    if(name_include === '' && footnote_end_data !== '') {
+    if(footnote_end_data !== '') {
         data = do_end_br_replace(data) + '<ul id="footnote_data">' + footnote_end_data + '</ul>';
     }
     
@@ -1246,7 +1246,7 @@ function do_onmark_redirect_render(data, data_js, name_doc) {
         
         if(
             window.location.search === '' &&
-            window.location.pathname.match(/^\/w\//)
+            !window.location.pathname.match(/\/doc_from\//)
         ) {
             window.location.href = '/w/' + do_url_change(link_main) + '/doc_from/' + do_url_change(name_doc) + link_sub;
         }
@@ -1349,9 +1349,9 @@ function do_onmark_render(
     data_js += '' + 
         'get_link_state("' + name_include + '");\n' + 
         'get_file_state("' + name_include + '");\n' + 
-		'get_heading_name();'
+		'get_heading_name();' +
+        'render_html("' + name_include + 'nowiki_html");\n' +
     ''
-    data_js += 'render_html("' + name_include + 'nowiki_html");\n'
     
     if(test_mode === 'normal') {
         document.getElementById(name_id).innerHTML = data + '<script>' + data_js + '</script>';

views/main_css/js/render_wiki.js

@@ -296,38 +296,29 @@ function do_open_folding(data, element = '') {
     }
 }
 
-function do_open_foot(name, num = 0) {
-    var found_include = name.match(/^(include_(?:[0-9]+)\-)/);
-    if(found_include) {
-        var include_name = name.replace(/^(?:include_(?:[0-9]+)\-)/, '');
-        var front_data = found_include[1];
-    } else {
-        var include_name = name;
-        var front_data = '';
-    }
-
+function do_open_foot(front_data, name, num = 0) {    
     if(
         document.cookie.match(main_css_regex_data('main_css_footnote_set')) &&
         document.cookie.match(main_css_regex_data('main_css_footnote_set'))[1] === '1'
     ) {
         if(num === 1) {
-            document.getElementById(front_data + 'r' + include_name).focus();
+            document.getElementById(front_data + 'r' + name).focus();
         } else {
-            var get_data = document.getElementById(front_data + include_name).innerHTML;
-            var org_data = document.getElementById(front_data + 'd' + include_name).innerHTML;
+            var get_data = document.getElementById(front_data + name).innerHTML;
+            var org_data = document.getElementById(front_data + 'd' + name).innerHTML;
             if(org_data === '') {
-                document.getElementById(front_data + 'd' + include_name).innerHTML = '' +
-                    '<a href="#' + front_data + 'c' + include_name + '">(Go)</a> ' + get_data +
+                document.getElementById(front_data + 'd' + name).innerHTML = '' +
+                    '<a href="#' + front_data + 'c' + name + '">(Go)</a> ' + get_data +
                 '';
-                document.getElementById(front_data + 'd' + include_name).className = 'spead_footnote';
+                document.getElementById(front_data + 'd' + name).className = 'spead_footnote';
             } else {
-                document.getElementById(front_data + 'd' + include_name).innerHTML = '';
-                document.getElementById(front_data + 'd' + include_name).className = '';
+                document.getElementById(front_data + 'd' + name).innerHTML = '';
+                document.getElementById(front_data + 'd' + name).className = '';
             }
         }
     } else {
-        document.getElementById(front_data + 'r' + include_name).style.color = 'red';
-        document.getElementById(front_data + 'c' + include_name).style.color = (num === 1 ? 'inherit' : 'red');
-        document.getElementById(front_data + (num === 1 ? 'r' : 'c') + include_name).focus();
+        document.getElementById(front_data + 'r' + name).style.color = 'red';
+        document.getElementById(front_data + 'c' + name).style.color = (num === 1 ? 'inherit' : 'red');
+        document.getElementById(front_data + (num === 1 ? 'r' : 'c') + name).focus();
     }
 }