2du 4 лет назад
Родитель
Сommit
f63670a1c2
2 измененных файлов с 36 добавлено и 43 удалено
  1. 28 42
      views/main_css/js/load_skin_set.js
  2. 8 1
      views/main_css/js/render_onmark.js

+ 28 - 42
views/main_css/js/load_skin_set.js

@@ -5,94 +5,94 @@ function main_css_regex_data(data) {
 function main_css_get_post() {    
     var check = document.getElementById('main_css_strike');
     if(check.value === 'normal') {
-        document.cookie = 'main_css_del_strike=0;';
+        document.cookie = 'main_css_del_strike=0; path=/;';
     } else if(check.value === 'change') {
-        document.cookie = 'main_css_del_strike=1;';
+        document.cookie = 'main_css_del_strike=1; path=/;';
     } else {
-        document.cookie = 'main_css_del_strike=2;';
+        document.cookie = 'main_css_del_strike=2; path=/;';
     }
 
     check = document.getElementById('main_css_bold');
     if(check.value === 'normal') {
-        document.cookie = 'main_css_del_bold=0;';
+        document.cookie = 'main_css_del_bold=0; path=/;';
     } else if(check.value === 'change') {
-        document.cookie = 'main_css_del_bold=1;';
+        document.cookie = 'main_css_del_bold=1; path=/;';
     } else {
-        document.cookie = 'main_css_del_bold=2;';
+        document.cookie = 'main_css_del_bold=2; path=/;';
     }
 
     check = document.getElementById('main_css_include');
     if(check.checked) {
-        document.cookie = 'main_css_include_link=1;';
+        document.cookie = 'main_css_include_link=1; path=/;';
     } else {
-        document.cookie = 'main_css_include_link=0;';
+        document.cookie = 'main_css_include_link=0; path=/;';
     }
 
     check = document.getElementById('main_css_category');
     if(check.value === 'bottom') {
-        document.cookie = 'main_css_category_set=0;';
+        document.cookie = 'main_css_category_set=0; path=/;';
     } else {
-        document.cookie = 'main_css_category_set=1;';
+        document.cookie = 'main_css_category_set=1; path=/;';
     }
 
     check = document.getElementById('main_css_footnote');
     if(check.value === 'spread') {
-        document.cookie = 'main_css_footnote_set=1;';
+        document.cookie = 'main_css_footnote_set=1; path=/;';
     } else {
-        document.cookie = 'main_css_footnote_set=0;';
+        document.cookie = 'main_css_footnote_set=0; path=/;';
     }
 
     check = document.getElementById('main_css_image');
     if(check.value === 'new_click') {
-        document.cookie = 'main_css_image_set=2;';
+        document.cookie = 'main_css_image_set=2; path=/;';
     } else if(check.value === 'click') {
-        document.cookie = 'main_css_image_set=1;';
+        document.cookie = 'main_css_image_set=1; path=/;';
     } else {
-        document.cookie = 'main_css_image_set=0;';
+        document.cookie = 'main_css_image_set=0; path=/;';
     }
 
     check = document.getElementById('main_css_image_paste');
     if(check.checked) {
-        document.cookie = 'main_css_image_paste=1;';
+        document.cookie = 'main_css_image_paste=1; path=/;';
     } else {
-        document.cookie = 'main_css_image_paste=0;';
+        document.cookie = 'main_css_image_paste=0; path=/;';
     }
 
     check = document.getElementById('main_css_toc');
     if(check.value === 'on') {
-        document.cookie = 'main_css_toc_set=2;';
+        document.cookie = 'main_css_toc_set=2; path=/;';
     } else if(check.value === 'off') {
-        document.cookie = 'main_css_toc_set=1;';
+        document.cookie = 'main_css_toc_set=1; path=/;';
     } else {
-        document.cookie = 'main_css_toc_set=0;';
+        document.cookie = 'main_css_toc_set=0; path=/;';
     }
     
     check = document.getElementById('main_css_font_size');
     if(check.value.match(/^[0-9]+$/)) {
-        document.cookie = 'main_css_font_size=' + check.value + ';';
+        document.cookie = 'main_css_font_size=' + check.value + '; path=/;';
     } else {
-        document.cookie = 'main_css_font_size=;';
+        document.cookie = 'main_css_font_size=; path=/;';
     }
 
     check = document.getElementById('main_css_monaco');
     if(check.checked) {
-        document.cookie = 'main_css_monaco=1;';
+        document.cookie = 'main_css_monaco=1; path=/;';
     } else {
-        document.cookie = 'main_css_monaco=0;';
+        document.cookie = 'main_css_monaco=0; path=/;';
     }
     
     check = document.getElementById('main_css_exter_link');
     if(check.value === 'self') {
-        document.cookie = 'main_css_exter_link=1;';
+        document.cookie = 'main_css_exter_link=1; path=/;';
     } else {
-        document.cookie = 'main_css_exter_link=0;';
+        document.cookie = 'main_css_exter_link=0; path=/;';
     }
     
     check = document.getElementById('main_css_link_delimiter');
     if(check.checked) {
-        document.cookie = 'main_css_link_delimiter=1;';
+        document.cookie = 'main_css_link_delimiter=1; path=/;';
     } else {
-        document.cookie = 'main_css_link_delimiter=0;';
+        document.cookie = 'main_css_link_delimiter=0; path=/;';
     }
     
     history.go(0);
@@ -123,20 +123,6 @@ function main_css_skin_load() {
         head_data.innerHTML += '<style>#include_link { display: inline; }</style>';
     }
 
-    if(
-        document.cookie.match(main_css_regex_data('main_css_category_set')) &&
-        document.cookie.match(main_css_regex_data('main_css_category_set'))[1] === '1'
-    ) {
-        var get_category = document.getElementById('cate_all');
-        if(get_category) {
-            var backup_category = get_category.innerHTML;
-            var in_data = document.getElementById('render_content').innerHTML;
-            get_category.innerHTML = '';
-            document.getElementById('render_content').innerHTML = backup_category + in_data;
-            head_data.innerHTML += '<style>#cate { margin-top: 0px; margin-bottom: 20px; }</style>';
-        }
-    }
-
     if(document.cookie.match(main_css_regex_data('main_css_toc_set'))) {
         if(document.cookie.match(main_css_regex_data('main_css_toc_set'))[1] === '2') {
             head_data.innerHTML += '<style>#auto_toc { display: none; }</style>';

+ 8 - 1
views/main_css/js/render_onmark.js

@@ -845,7 +845,14 @@ function do_onmark_last_render(data, name_include, data_category) {
     data = do_end_br_replace(data);
     data = data.replace(/\n/g, '<br>');
     
-    data += data_category;
+    if(
+        document.cookie.match(main_css_regex_data('main_css_category_set')) &&
+        document.cookie.match(main_css_regex_data('main_css_category_set'))[1] === '1'
+    ) {
+        data = data_category + '<hr class="main_hr">' + data;
+    } else {
+        data += data_category;
+    }
 
     return data;
 }