Преглед изворни кода

기본 스킨 분류 위치 지정 추가

Surplus_Up (2DU) пре 6 година
родитељ
комит
c566a4c75a
3 измењених фајлова са 111 додато и 62 уклоњено
  1. 1 1
      views/marisa/index.html
  2. 1 1
      views/marisa/info.json
  3. 109 60
      views/marisa/js/skin_set.js

+ 1 - 1
views/marisa/index.html

@@ -11,7 +11,7 @@
         <link rel="stylesheet" href="/views/marisa/css/main.css?ver=7">
         <script src="/views/marisa/js/skin_set.js?ver=3"></script>
         <script src="/views/marisa/js/main.js?ver=3"></script>
-        <script>window.onload = function () { skin_set(); }</script>
+        <script>window.onload = function () { skin_set(); main_load(); }</script>
         <script src="https://code.iconify.design/1/1.0.3/iconify.min.js"></script>
         <link rel="shortcut icon" href="/views/main_css/file/favicon.ico?ver=1">
         {{imp[1][5]|safe}}

+ 1 - 1
views/marisa/info.json

@@ -1,5 +1,5 @@
 {
     "name" : "Marisa",
-    "skin_ver" : "v1.1.7",
+    "skin_ver" : "v1.1.8",
     "require_ver" : "7"
 }

+ 109 - 60
views/marisa/js/skin_set.js

@@ -1,5 +1,5 @@
 function get_post() {
-    check = document.getElementById('strike');
+    var check = document.getElementById('strike');
     if(check.value === 'normal') {
         document.cookie = 'del_strike=0;';
     } else if(check.value === 'change') {
@@ -31,11 +31,18 @@ function get_post() {
         document.cookie = 'invert=0;';
     }
 
+    check = document.getElementById('category');
+    if(check.value === 'bottom') {
+        document.cookie = 'category_set=0;';
+    } else {
+        document.cookie = 'category_set=1;';
+    }
+
     history.go(0);
 }
 
 function main_load() {
-    head_data = document.querySelector('head');
+    var head_data = document.querySelector('head');
     if(cookies.match(regex_data('del_strike'))) {
         if(cookies.match(regex_data('del_strike'))[1] === '1') {
             head_data.innerHTML += '<style>s { text-decoration: none; } s:hover { background-color: transparent; }</style>';
@@ -65,18 +72,33 @@ function main_load() {
     ) {
         head_data.innerHTML += '<link rel="stylesheet" href="/views/marisa/css/dark.css?ver=5">';
     }
+
+    if(
+        cookies.match(regex_data('category_set')) &&
+        cookies.match(regex_data('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('in_data_0').innerHTML;
+            get_category.innerHTML = '';
+
+            backup_category = backup_category.replace('<hr>', '') + '<hr>';
+
+            document.getElementById('in_data_0').innerHTML = backup_category + in_data;
+        }
+    }
 }
 
 function regex_data(data) {
     return new RegExp('(?:^|; )' + data + '=([^;]*)');
 }
 
-cookies = document.cookie;
-main_load();
+var cookies = document.cookie;
 
 function skin_set() {
     if(window.location.pathname === '/skin_set') {
-        set_language = {
+        var set_language = {
             "en-US" : {
                 "default" : "Default",
                 "change_to_normal" : "Change to normal text",
@@ -86,7 +108,10 @@ function skin_set() {
                 "strike" : "Strike",
                 "bold" : "Bold",
                 "other" : "Other",
-                "darkmode" : "Darkmode"
+                "darkmode" : "Darkmode",
+                "where_category" : "Set category location",
+                "bottom" : "Bottom",
+                "top" : "Top"
             }, "ko-KR" : {
                 "default" : "기본값",
                 "change_to_normal" : "일반 텍스트로 변경",
@@ -96,12 +121,15 @@ function skin_set() {
                 "strike" : "취소선",
                 "bold" : "볼드체",
                 "other" : "기타",
-                "darkmode" : "다크모드"
+                "darkmode" : "다크모드",
+                "where_category" : "분류 위치 설정",
+                "bottom" : "아래",
+                "top" : "위"
             }
         }
 
-        language = cookies.match(regex_data('language'))[1];
-        user_language = cookies.match(regex_data('user_language'))[1];
+        var language = cookies.match(regex_data('language'))[1];
+        var user_language = cookies.match(regex_data('user_language'))[1];
         if(user_language in set_language) {
             language = user_language;
         }
@@ -110,63 +138,55 @@ function skin_set() {
             language = "en-US";
         }
 
-        data = document.getElementById("main_skin_set");
-        set_data = {};
-
-        if(cookies.match(regex_data('del_strike'))) {
-            if(cookies.match(regex_data('del_strike'))[1] === '0') {
-                set_data["strike"] = ' \
-                    <option value="normal">' + set_language[language]['default'] + '</option> \
-                    <option value="change">' + set_language[language]['change_to_normal'] + '</option> \
-                    <option value="delete">' + set_language[language]['delete'] + '</option> \
-                ';
-            } else if(cookies.match(regex_data('del_strike'))[1] === '1') {
-                set_data["strike"] = ' \
-                    <option value="change">' + set_language[language]['change_to_normal'] + '</option> \
-                    <option value="normal">' + set_language[language]['default'] + '</option> \
-                    <option value="delete">' + set_language[language]['delete'] + '</option> \
-                ';
+        var data = document.getElementById("main_skin_set");
+        var set_data = {};
+
+        var strike_list = [
+            ['0', 'normal', set_language[language]['default']],
+            ['1', 'change', set_language[language]['change_to_normal']],
+            ['2', 'delete', set_language[language]['delete']]
+        ];
+        set_data["strike"] = '';
+        var i = 0;
+        while(1) {
+            if(strike_list[i]) {
+                if(
+                    cookies.match(regex_data('del_strike')) && 
+                    cookies.match(regex_data('del_strike'))[1] === strike_list[i][0]
+                ) {
+                    set_data["strike"] = '<option value="' + strike_list[i][1] + '">' + strike_list[i][2] + '</option>' + set_data["strike"];
+                } else {
+                    set_data["strike"] += '<option value="' + strike_list[i][1] + '">' + strike_list[i][2] + '</option>';
+                }
+
+                i += 1;
             } else {
-                set_data["strike"] = ' \
-                    <option value="delete">' + set_language[language]['delete'] + '</option> \
-                    <option value="normal">' + set_language[language]['default'] + '</option> \
-                    <option value="change">' + set_language[language]['change_to_normal'] + '</option> \
-                ';
+                break;
             }
-        } else {
-            set_data["strike"] = ' \
-                <option value="normal">' + set_language[language]['default'] + '</option> \
-                <option value="change">' + set_language[language]['change_to_normal'] + '</option> \
-                <option value="delete">' + set_language[language]['delete'] + '</option> \
-            ';
         }
 
-        if(cookies.match(regex_data('del_bold'))) {
-            if(cookies.match(regex_data('del_bold'))[1] === '0') {
-                set_data["bold"] = ' \
-                    <option value="normal">' + set_language[language]['default'] + '</option> \
-                    <option value="change">' + set_language[language]['change_to_normal'] + '</option> \
-                    <option value="delete">' + set_language[language]['delete'] + '</option> \
-                ';
-            } else if(cookies.match(regex_data('del_bold'))[1] === '1') {
-                set_data["bold"] = ' \
-                    <option value="change">' + set_language[language]['change_to_normal'] + '</option> \
-                    <option value="normal">' + set_language[language]['default'] + '</option> \
-                    <option value="delete">' + set_language[language]['delete'] + '</option> \
-                ';
+        var bold_list = [
+            ['0', 'normal', set_language[language]['default']],
+            ['1', 'change', set_language[language]['change_to_normal']],
+            ['2', 'delete', set_language[language]['delete']]
+        ];
+        set_data["bold"] = '';
+        var i = 0;
+        while(1) {
+            if(bold_list[i]) {
+                if(
+                    cookies.match(regex_data('del_bold')) && 
+                    cookies.match(regex_data('del_bold'))[1] === bold_list[i][0]
+                ) {
+                    set_data["bold"] = '<option value="' + bold_list[i][1] + '">' + bold_list[i][2] + '</option>' + set_data["bold"];
+                } else {
+                    set_data["bold"] += '<option value="' + bold_list[i][1] + '">' + bold_list[i][2] + '</option>';
+                }
+
+                i += 1;
             } else {
-                set_data["bold"] = ' \
-                    <option value="delete">' + set_language[language]['delete'] + '</option> \
-                    <option value="normal">' + set_language[language]['default'] + '</option> \
-                    <option value="change">' + set_language[language]['change_to_normal'] + '</option> \
-                ';
+                break;
             }
-        } else {
-            set_data["bold"] = ' \
-                <option value="normal">' + set_language[language]['default'] + '</option> \
-                <option value="change">' + set_language[language]['change_to_normal'] + '</option> \
-                <option value="delete">' + set_language[language]['delete'] + '</option> \
-            ';
         }
 
         if(
@@ -183,6 +203,30 @@ function skin_set() {
             set_data["invert"] = "checked";
         }
 
+        var category_list = [
+            ['0', 'bottom', set_language[language]['bottom']],
+            ['1', 'top', set_language[language]['top']],
+        ];
+        set_data["category"] = '';
+        var i = 0;
+        while(1) {
+            if(category_list[i]) {
+                if(
+                    cookies.match(regex_data('category_set')) && 
+                    cookies.match(regex_data('category_set'))[1] === category_list[i][0]
+                ) {
+                    set_data["category"] = '<option value="' + category_list[i][1] + '">' + category_list[i][2] + '</option>' + set_data["category"];
+                } else {
+                    set_data["category"] += '<option value="' + category_list[i][1] + '">' + category_list[i][2] + '</option>';
+                }
+
+                i += 1;
+            } else {
+                break;
+            }
+        }
+
+
         data.innerHTML = ' \
             <h2>' + set_language[language]['strike'] + '</h2> \
             <hr class="main_hr"> \
@@ -193,6 +237,11 @@ function skin_set() {
             <select id="bold" name="bold"> \
                 ' + set_data["bold"] + ' \
             </select> \
+            <h2>' + set_language[language]['where_category'] + '</h2> \
+            <select id="category" name="category"> \
+                ' + set_data["category"] + ' \
+            </select> \
+            <hr class="main_hr"> \
             <h2>' + set_language[language]['other'] + '</h2> \
             <input ' + set_data["include"] + ' type="checkbox" id="include" name="include" value="include"> ' + set_language[language]['include_link'] + ' \
             <hr class="main_hr"> \