Merge pull request #1197 from openNAMU/dev

rollback

views/main_css/js/render_onmark.js

@@ -211,6 +211,8 @@ function do_onmark_heading_render(data, name_doc, name_include) {
     
     if(toc_data !== '') {
         toc_data += '</div>';
+
+        data = do_end_br_replace(data) + '</div>';
     }
     
     var toc_auto_add = data.match(/\[(?:목차|toc)\(no\)\]/);
@@ -225,7 +227,7 @@ function do_onmark_heading_render(data, name_doc, name_include) {
     
     data = data.replace(toc_re, toc_data);
     
-    return [data, toc_data];
+    return data;
 }
 
 function do_onmark_link_render(data, data_js, name_doc, name_include, data_nowiki, data_wiki_set) {
@@ -767,7 +769,7 @@ function do_onmark_middle_render(data, data_js, name_include, data_nowiki, name_
     return [data, data_js, data_nowiki];
 }
 
-function do_onmark_last_render(data, name_include, data_category, data_toc) {       
+function do_onmark_last_render(data, name_include, data_category) {       
     // middle_render 마지막 처리
     data = data.replace(/<wiki_s_[0-9] /g, '<div ');
     data = data.replace(/<wiki_e_[0-9]>/g, '</div>');
@@ -785,10 +787,6 @@ function do_onmark_last_render(data, name_include, data_category, data_toc) {
         data += data_category;
     }
     
-    if(data_toc !== '') {
-        data += '</div>';
-    }
-    
     return data;
 }
 
@@ -1303,10 +1301,7 @@ function do_onmark_render(
         data_nowiki = data_var[2];
 
         data = do_onmark_text_render(data);
-        data_var = do_onmark_heading_render(data, name_doc, name_include);
-        data = data_var[0];
-        var data_toc = data_var[1];
-        
+        data = do_onmark_heading_render(data, name_doc, name_include);
         data = do_onmark_table_render(data);
 
         data_var = do_onmark_link_render(
@@ -1328,12 +1323,7 @@ function do_onmark_render(
         data = do_onmark_list_render(data);
         data = do_onmark_hr_render(data);
         data = do_onmark_footnote_render(data, name_include);
-        data = do_onmark_last_render(
-            data, 
-            name_include, 
-            data_category,
-            data_toc
-        );
+        data = do_onmark_last_render(data, name_include, data_category);
     }
     
     data_js += '' +