yolinlin/aowow
1
0
Fork 0
mirror of https://github.com/Sarjuuk/aowow.git synced 2025-11-29 15:58:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Markup

Browse Source 
* allow 'auto' as width for tables
 * db tag 'money' may include currency AND items
This commit is contained in:
Sarjuuk
2022-01-05 23:29:35 +01:00
parent 2ec4809c7f
commit dcb8995b1a
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
includes/markup.class.php
View File

@@ -31,7 +31,8 @@ class Markup
$match[1] = 'achievement'; $match[1] = 'achievement';
else if ($match[1] == 'icondb') else if ($match[1] == 'icondb')
$match[1] = 'icon'; $match[1] = 'icon';
else if ($match[1] == 'money')
if ($match[1] == 'money')
{ {
if (stripos($match[0], 'items')) if (stripos($match[0], 'items'))
{ {

2
static/js/Markup.js
View File

@@ -2798,7 +2798,7 @@ var Markup = {
border: { req: false, valid: /^[0-9]+$/ }, border: { req: false, valid: /^[0-9]+$/ },
cellspacing: { req: false, valid: /^[0-9]+$/ }, cellspacing: { req: false, valid: /^[0-9]+$/ },
cellpadding: { req: false, valid: /^[0-9]+$/ }, cellpadding: { req: false, valid: /^[0-9]+$/ },
width: { req: false, valid: /^[0-9]+(px|em|\%)$/ } width: { req: false, valid: /^([0-9]+(px|em|\%)|auto)$/ }
}, },
toHtml: function(attr) toHtml: function(attr)
{ {