Bladeren bron

기본 스킨 버그 수정

Surplus_Up (2DU) 6 jaren geleden
bovenliggende
commit
6ef958036e
5 gewijzigde bestanden met toevoegingen van 76 en 71 verwijderingen
  1. 2 0
      route/tool/func.py
  2. 3 2
      views/marisa/index.html
  3. 1 1
      views/marisa/info.json
  4. 6 4
      views/marisa/js/search.js
  5. 64 64
      views/marisa/js/skin_set.js

+ 2 - 0
route/tool/func.py

@@ -1068,6 +1068,8 @@ def re_error(data):
                 data = load_lang('authority_error')
             elif num == 4:
                 data = load_lang('no_admin_block_error')
+            elif num == 5:
+                data = load_lang('skin_error')
             elif num == 6:
                 data = load_lang('same_id_exist_error')
             elif num == 7:

+ 3 - 2
views/marisa/index.html

@@ -5,9 +5,10 @@
         <title>{{imp[0]}} - {{imp[1][0]}}</title>
         {{imp[3][3]|safe}}
         <link rel="stylesheet" href="/views/marisa/css/main.css?ver=3">
-        <script src="/views/marisa/js/main.js?ver=1"></script>
-        <script src="/views/marisa/js/skin_set.js?ver=1"></script>
         <script src="/views/marisa/js/search.js?ver=1"></script>
+        <script src="/views/marisa/js/skin_set.js?ver=2"></script>
+        <script src="/views/marisa/js/main.js?ver=1"></script>
+        <script>window.onload = function () { search_do(); skin_set(); }</script>
         <link   rel="stylesheet"
                 href="https://use.fontawesome.com/releases/v5.7.2/css/all.css"
                 integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr"

+ 1 - 1
views/marisa/info.json

@@ -1,5 +1,5 @@
 {
     "name" : "Marisa",
-    "skin_ver" : "v1.0.7",
+    "skin_ver" : "v1.0.8",
     "require_ver" : "3"
 }

+ 6 - 4
views/marisa/js/search.js

@@ -1,6 +1,5 @@
-window.onload = function () {
-    var before = '';
-    setInterval(function() {
+function search_do() {
+    function search_load() {
         var data = document.getElementById("search_input").value;
         if(before !== data && data !== '') {
             before = data;
@@ -30,5 +29,8 @@ window.onload = function () {
             before = '';
             document.getElementById("pre_search").style.display = 'none';
         }
-    }, 1000);
+    }
+
+    var before = '';
+    setInterval(search_load, 1000);
 }

+ 64 - 64
views/marisa/js/skin_set.js

@@ -1,83 +1,83 @@
-function get_post() {
-    check = document.getElementById('strike');
-    if(check.value === 'normal') {
-        document.cookie = 'del_strike=0;';
-    } else if(check.value === 'change') {
-        document.cookie = 'del_strike=1;';
-    } else {
-        document.cookie = 'del_strike=2;';
-    }
+function skin_set() {
+    function get_post() {
+        check = document.getElementById('strike');
+        if(check.value === 'normal') {
+            document.cookie = 'del_strike=0;';
+        } else if(check.value === 'change') {
+            document.cookie = 'del_strike=1;';
+        } else {
+            document.cookie = 'del_strike=2;';
+        }
 
-    check = document.getElementById('bold');
-    if(check.value === 'normal') {
-        document.cookie = 'del_bold=0;';
-    } else if(check.value === 'change') {
-        document.cookie = 'del_bold=1;';
-    } else {
-        document.cookie = 'del_bold=2;';
-    }
+        check = document.getElementById('bold');
+        if(check.value === 'normal') {
+            document.cookie = 'del_bold=0;';
+        } else if(check.value === 'change') {
+            document.cookie = 'del_bold=1;';
+        } else {
+            document.cookie = 'del_bold=2;';
+        }
 
-    check = document.getElementById('include');
-    if(check.checked === true) {
-        document.cookie = 'include_link=1;';
-    } else {
-        document.cookie = 'include_link=0;';
-    }
+        check = document.getElementById('include');
+        if(check.checked === true) {
+            document.cookie = 'include_link=1;';
+        } else {
+            document.cookie = 'include_link=0;';
+        }
 
-    check = document.getElementById('invert');
-    if(check.checked === true) {
-        document.cookie = 'invert=1;';
-    } else {
-        document.cookie = 'invert=0;';
-    }
+        check = document.getElementById('invert');
+        if(check.checked === true) {
+            document.cookie = 'invert=1;';
+        } else {
+            document.cookie = 'invert=0;';
+        }
 
-    history.go(0);
-}
+        history.go(0);
+    }
 
-function regex_data(data) {
-    r_data = new RegExp('(?:^|; )' + data + '=([^;]*)')
+    function regex_data(data) {
+        r_data = new RegExp('(?:^|; )' + data + '=([^;]*)')
 
-    return r_data;
-}
+        return r_data;
+    }
 
-cookies = document.cookie;
+    cookies = document.cookie;
 
-function main_load() {
-    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>';
-        } else if(cookies.match(regex_data('del_strike'))[1] === '2') {
-            head_data.innerHTML += '<style>s { display: none; }</style>';
+    function main_load() {
+        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>';
+            } else if(cookies.match(regex_data('del_strike'))[1] === '2') {
+                head_data.innerHTML += '<style>s { display: none; }</style>';
+            }
         }
-    }
 
-    if(cookies.match(regex_data('del_bold'))) {
-        if(cookies.match(regex_data('del_bold'))[1] === '1') {
-            head_data.innerHTML += '<style>b { font-weight: normal; }</style>';
-        } else if(cookies.match(regex_data('del_bold'))[1] === '2') {
-            head_data.innerHTML += '<style>b { display: none; }</style>';
+        if(cookies.match(regex_data('del_bold'))) {
+            if(cookies.match(regex_data('del_bold'))[1] === '1') {
+                head_data.innerHTML += '<style>b { font-weight: normal; }</style>';
+            } else if(cookies.match(regex_data('del_bold'))[1] === '2') {
+                head_data.innerHTML += '<style>b { display: none; }</style>';
+            }
         }
-    }
 
-    if(
-        cookies.match(regex_data('include_link')) &&
-        cookies.match(regex_data('include_link'))[1] === '1'
-    ) {
-        head_data.innerHTML += '<style>#include_link { display: inline; }</style>';
-    }
+        if(
+            cookies.match(regex_data('include_link')) &&
+            cookies.match(regex_data('include_link'))[1] === '1'
+        ) {
+            head_data.innerHTML += '<style>#include_link { display: inline; }</style>';
+        }
 
-    if(
-        cookies.match(regex_data('invert')) &&
-        cookies.match(regex_data('invert'))[1] === '1'
-    ) {
-        head_data.innerHTML += '<style>body { -webkit-filter: invert(100%); filter: invert(100%); background: black; }</style>';
+        if(
+            cookies.match(regex_data('invert')) &&
+            cookies.match(regex_data('invert'))[1] === '1'
+        ) {
+            head_data.innerHTML += '<style>body { -webkit-filter: invert(100%); filter: invert(100%); background: black; }</style>';
+        }
     }
-}
 
-main_load();
+    main_load();
 
-window.onload = function () {
     if(window.location.pathname === '/skin_set') {
         set_language = {
             "en-US" : {