fix bug

route/tool/func.py

@@ -84,7 +84,7 @@ if sys.version_info < (3, 6):
 global_lang = {}
 global_wiki_set = {}
 
-data_css_ver = '108'
+data_css_ver = '109'
 data_css = ''
 
 conn = ''
@@ -515,7 +515,7 @@ def edit_button(editor_display = '0'):
     for insert_data in insert_list:
         data += '' + \
             '<a href="' + \
-                'javascript:do_insert_data(\'content\', \'' + insert_data[0] + '\', ' + editor_display + ')' + \
+                'javascript:do_insert_data(\'textarea_edit_view\', \'' + insert_data[0] + '\', ' + editor_display + ')' + \
             '">(' + insert_data[1] + ')</a> ' + \
         ''
 
@@ -740,18 +740,13 @@ def wiki_css(data):
     return data
 
 def cut_100(data):
-    if re.search(r'^\/w\/', flask.request.path):
-        data = re.sub(r'<script>((\n*(((?!<\/script>).)+)\n*)+)<\/script>', '', data)
-        data = re.sub(r'<hr class="main_hr">((\n*((.+)\n*))+)$', '', data)
-        data = re.sub(r'<div id="cate_all">((\n*((.+)\n*))+)$', '', data)        
-
-        data = re.sub(r'<(((?!>).)*)>', ' ', data)
-        data = re.sub(r'\n', ' ', data)
-        data = re.sub(r'^ +', '', data)
-        data = re.sub(r' +$', '', data)
-        data = re.sub(r' {2,}', ' ', data)
-    
-        return data[0:100] + '...'
+    data = re.search(r'<pre style="display: none;" id="render_content_load">([^<>]+)<\/pre>', data)
+    if data:
+        data = data.group(1)
+        if len(data) > 100:
+            return data[0:100] + '...'
+        else:
+            return data[0:len(data)]
     else:
         return ''
 
@@ -803,7 +798,7 @@ def wiki_set(num = 1):
 
     return data_list
 
-def wiki_custom():
+def wiki_custom():    
     ip = ip_check()
     if ip_or_user(ip) == 0:
         user_icon = 1
@@ -846,6 +841,12 @@ def wiki_custom():
 
     curs.execute(db_change("select title from rd where title = ? and stop = ''"), ['user:' + ip])
     user_topic = '1' if curs.fetchall() else '0'
+    
+    split_path = flask.request.path.split('/')
+    if len(split_path) > 1:
+        split_path = split_path[1]
+    else:
+        split_path = 0
 
     return [
         '',
@@ -859,7 +860,8 @@ def wiki_custom():
         user_notice,
         user_acl_list,
         ip,
-        user_topic
+        user_topic,
+        split_path
     ]
 
 def load_skin(data = '', set_n = 0, default = 0):

version.json

@@ -1,7 +1,7 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.0-beta (stable2) (beta6) (dev22)",
+        "r_ver" : "v3.4.0-beta (stable2) (beta7) (dev23)",
         "c_ver" : "3400101",
-        "s_ver" : "12"
+        "s_ver" : "13"
     }
 }

views/main_css/css/main.css

@@ -54,9 +54,13 @@ a {
 }
 
 #out_link::before {
-    background: green;
-    color: white;
-    content: "E";
+    content: '🅴';
+    
+    font-weight: lighter;
+    
+    background: transparent;
+    color: green;
+    
     margin-right: 2px;
 }
 

views/main_css/js/render_onmark.js

@@ -5,9 +5,13 @@ function do_url_change(data) {
     return encodeURIComponent(data);
 }
 
-function do_nowiki_change(data, data_nowiki) {
-    return data.replace(/<span id="((?:.*)(?:nowiki_(?:[^"]+)))"><\/span>/, function(x, x_1) {
-        return data_nowiki[x_1];
+function do_nowiki_change(data, data_nowiki, type = 'normal') {
+    return data.replace(/<span id="((?:[^"]*)(?:nowiki_(?:[^"]+)))"><\/span>/g, function(x, x_1) {
+        if(type === 'normal') {
+            return data_nowiki[x_1];
+        } else {
+            return '\\' + data_nowiki[x_1];
+        }
     });
 }
 
@@ -460,10 +464,10 @@ function do_onmark_link_render(data, data_js, name_doc, name_include, data_nowik
             category_data = '<div style="display: none;" id="cate_all"><div id="cate">Category : ' + category_data;
         }
         
-        data = do_end_br_replace(data) + category_data.replace(/\| $/, '') + '</div></div>';
+        category_data = category_data.replace(/\| $/, '') + '</div></div>';
     }
     
-    return [data, data_js];
+    return [data, data_js, category_data];
 }
 
 function do_onmark_footnote_render(data, name_include) {
@@ -764,7 +768,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) {       
+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>');
@@ -778,6 +782,10 @@ function do_onmark_last_render(data) {
     data = do_end_br_replace(data);
     data = data.replace(/\n/g, '<br>');
     
+    if(name_include === '') {
+        data += data_category;
+    }
+    
     return data;
 }
 
@@ -1180,14 +1188,18 @@ function do_onmark_list_render(data) {
     return data;
 }
 
-function do_onmark_math_render(data, data_js, name_include) {
-    data = data.replace(/<math>((?:(?!<\/math>).)+)<\/math>/g, '[math($1)]');
+function do_onmark_math_render(data, data_js, name_include, data_nowiki) {
+    data = data.replace(/&lt;math&gt;((?:(?!&lt;\/math&gt;).)+)&lt;\/math&gt;/g, '[math($1)]');
     
     var i = 0;
     data = data.replace(/\[math\((((?!\)]).)+)\)]/g, function(x, x_1) {
         i += 1;
         
-        data_js += do_math_try_insert(name_include + 'math_' + String(i), do_js_safe_change(do_xss_change(x_1)));
+        data_js += do_math_try_insert(
+            name_include + 'math_' + String(i), 
+            do_js_safe_change(do_xss_change(do_nowiki_change(x_1, data_nowiki, 'math')))
+        );
+        
         return '<span id="' + name_include + 'math_' + String(i) + '"></span>';
     });
     
@@ -1274,7 +1286,7 @@ function do_onmark_render(
         data_js = data_var[1];
         data_nowiki = data_var[2];
         
-        data_var = do_onmark_math_render(data, data_js, name_include);
+        data_var = do_onmark_math_render(data, data_js, name_include, data_nowiki);
         data = data_var[0];
         data_js = data_var[1];
 
@@ -1301,6 +1313,7 @@ function do_onmark_render(
         );
         data = data_var[0];
         data_js = data_var[1];
+        var data_category = data_var[2];
 
         data_var = do_onmark_macro_render(data, data_js);
         data = data_var[0];
@@ -1309,7 +1322,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 = do_onmark_last_render(data, name_include, data_category);
     }
     
     data_js += '' + 

views/tenshi/css/main.css

@@ -420,13 +420,6 @@ select {
 }
 
 /* content */
-#out_link::before {
-    content: '🅴';
-    font-weight: lighter;
-    background: transparent;
-    color: green;
-}
-
 a:hover {
     text-decoration: underline;
 }

views/tenshi/index.html

@@ -22,7 +22,9 @@
             <meta name="title" content="{{imp[0]}} - {{imp[1][0]}}">
         {% endif %}
         <meta name="keywords" content="{{imp[0]}}">
-        <meta name="description" content="{{data|cut_100}}">
+        {% if imp[2][12] != 0 and imp[2][12] == 'w' %}
+            <meta name="description" content="{{data|cut_100}}">
+        {% endif %}
         <meta name="viewport" content="width=device-width, initial-scale=1">
     </head>
     <body>