2du 3 лет назад
Родитель
Сommit
aea1a4c4e3

+ 2 - 4
route/recent_change.py

@@ -132,16 +132,14 @@ def recent_change(name = None, tool = ''):
                         <td>''' + date + '''</td>
                     </tr>
                     <tr ''' + style[1] + '''>
-                        <td class="send_content" colspan="3">
-                            ''' + (html.escape(send) if send != '' else '<br>') + '''
-                        </td>
+                        <td class="opennamu_send_content" colspan="3">''' + html.escape(send) + '''</td>
                     </tr>
                 '''
 
             div += '''
                     </tbody>
                 </table>
-                <script>send_render();</script>
+                <!-- JS : opennamu_send_render -->
             '''
 
             if name:

+ 1 - 1
route/tool/func.py

@@ -1051,6 +1051,7 @@ def wiki_css(data):
     
     data_css += '<script defer src="/views/main_css/js/func/render_user_name.js?ver=' + data_css_ver + '"></script>'
     data_css += '<script defer src="/views/main_css/js/func/render_simple.js?ver=' + data_css_ver + '"></script>'
+    data_css += '<script defer src="/views/main_css/js/func/render_send.js?ver=' + data_css_ver + '"></script>'
     
     # Render JS
     data_css += '<script src="/views/main_css/js/render/markdown.js?ver=' + data_css_ver + '"></script>'
@@ -1062,7 +1063,6 @@ def wiki_css(data):
     # 레거시 일반 JS
     data_css += '<script src="/views/main_css/js/load_editor.js?ver=' + data_css_ver + '"></script>'
     data_css += '<script src="/views/main_css/js/load_skin_set.js?ver=' + data_css_ver + '"></script>'
-    data_css += '<script src="/views/main_css/js/load_something.js?ver=' + data_css_ver + '"></script>'
     
     # 레거시 렌더러 JS
     data_css += '<script src="/views/main_css/js/render_html.js?ver=' + data_css_ver + '"></script>'

+ 2 - 2
route/user_alarm.py

@@ -21,14 +21,14 @@ def user_alarm():
             for data_one in data_list:
                 data += '' + \
                     '<li>' + \
-                        '<span class="send_content">' + html.escape(data_one[0]) + '</span> ' + \
+                        '<span class="opennamu_send_content">' + html.escape(data_one[0]) + '</span> ' + \
                         '(' + data_one[1] + ')' + \
                     '</li>' + \
                 ''
     
         data += '' + \
             '</ul>' + \
-            '<script>send_render();</script>' + \
+            '<!-- JS : opennamu_send_render -->' + \
             next_fix('/alarm?num=', num, data_list) + \
         ''
     

+ 3 - 8
route/user_setting.py

@@ -122,17 +122,12 @@ def user_setting():
                             <hr class="main_hr">
                             <select name="user_title">''' + div4 + '''</select>
                             <h2>''' + load_lang('2fa') + '''</h2>
-                            <select name="2fa"
-                                    id="twofa_check_input"
-                                    onchange="do_twofa_check(0);">''' + fa_data_select + '''</select>
-                            <div id="fa_plus_content">
-                                <hr class="main_hr">
-                                <input type="password" name="2fa_pw" placeholder="''' + fa_data_pw + '''">
-                            </div>
+                            <select name="2fa" id="twofa_check_input">''' + fa_data_select + '''</select>
+                            <hr class="main_hr">
+                            <input type="password" name="2fa_pw" placeholder="''' + fa_data_pw + '''">
                             <hr class="main_hr">
                             <button type="submit">''' + load_lang('save') + '''</button>
                             ''' + http_warning() + '''
-                            <script>do_twofa_check(1);</script>
                         </form>
                     ''',
                     menu = [['user', load_lang('return')]]

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.5 (stable2) (beta3) (dev30)",
+        "r_ver" : "v3.4.5 (stable2) (beta3) (dev31)",
         "c_ver" : "3500113",
         "s_ver" : "3500110"
     }

+ 31 - 0
views/main_css/js/func/render_send.js

@@ -0,0 +1,31 @@
+"use strict";
+
+function opennamu_send_render(i = 0) {
+    let get_class = document.getElementsByClassName('opennamu_send_content')[i];
+    if(get_class) {
+        opennamu_send_render(i + 1);
+        
+        let data = get_class.innerHTML;
+        if(data === '&lt;br&gt;' || data === '') {
+            document.getElementsByClassName('opennamu_send_content')[i].innerHTML = '<br>';
+        } else {
+            data = data.replace(/javascript:/i, '');
+            data = data.replace(/&lt;a(?:(?:(?!&gt;).)*)&gt;((?:(?!&lt;\/a&gt;).)+)&lt;\/a&gt;/g, function(x, x_1) {
+                let x_1_org = x_1.replace('&lt;', '<').replace('&gt;', '>');
+                
+                return '<a href="/w/' + encodeURIComponent(x_1_org) + '">' + x_1 + '</a>';
+            });
+            
+            document.getElementsByClassName('opennamu_send_content')[i].innerHTML = data;
+        }
+    }
+}
+
+let opennamu_send_render_url = [
+    '/alarm',
+    '/recent_change',
+    '/recent_changes'
+];
+if(opennamu_send_render_url.includes(window.location.pathname)) {
+    opennamu_send_render();
+}

+ 0 - 31
views/main_css/js/load_something.js

@@ -1,31 +0,0 @@
-function do_twofa_check(init = 0) {
-    let twofa_option = document.getElementById('twofa_check_input');
-    let twofa_option_num = twofa_option.options.selectedIndex;
-    let twofa_select_data = twofa_option.options[twofa_option_num].value;
-    
-    if(twofa_select_data === 'on') {
-        document.getElementById('fa_plus_content').style.display = "block";
-    } else {
-        document.getElementById('fa_plus_content').style.display = "none";
-    }
-}
-
-function send_render(i = 0) {
-    let get_class = document.getElementsByClassName('send_content')[i];
-    if(get_class) {
-        send_render(i + 1);
-        
-        let data = get_class.innerHTML;
-        if(data === '&lt;br&gt;') {
-            document.getElementsByClassName('send_content')[i].innerHTML = '<br>';
-        } else {
-            data = data.replace(/javascript:/i, '');
-            data = data.replace(/&lt;a(?:(?:(?!&gt;).)*)&gt;((?:(?!&lt;\/a&gt;).)+)&lt;\/a&gt;/g, function(x, x_1) {
-                x_1_org = x_1.replace('&lt;', '<').replace('&gt;', '>');
-                return '<a href="/w/' + encodeURIComponent(x_1_org) + '">' + x_1 + '</a>';
-            });
-            
-            document.getElementsByClassName('send_content')[i].innerHTML = data;
-        }
-    }
-}