IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-30 12:43:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

strip classes from table instead of ignoring table

Browse Source
This commit is contained in:
Sam 2015-07-20 17:05:24 +10:00
parent e93665b9f7
commit ecf50a741c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/dialects/table_dialect.js
View File

@ -23,7 +23,7 @@ var emitter = function(contents) {
}; };
var tableBlock = { var tableBlock = {
start: /(<table>)([\S\s]*)/igm, start: /(<table[^>]*>)([\S\s]*)/igm,
stop: /<\/table>/igm, stop: /<\/table>/igm,
rawContents: true, rawContents: true,
emitter: emitter, emitter: emitter,

2
spec/components/pretty_text_spec.rb
View File

@ -343,7 +343,7 @@ describe PrettyText do
it 'allows table html' do it 'allows table html' do
SiteSetting.allow_html_tables = true SiteSetting.allow_html_tables = true
PrettyText.reset_context PrettyText.reset_context
table = "<table><thead><tr>\n<th>test</th></tr></thead><tbody><tr><td>a</td></tr></tbody></table>" table = "<table class='fa-spin'><thead><tr>\n<th>test</th></tr></thead><tbody><tr><td>a</td></tr></tbody></table>"
match = "<table class=\"md-table\"><thead><tr> <th>test</th> </tr></thead><tbody><tr><td>a</td></tr></tbody></table>" match = "<table class=\"md-table\"><thead><tr> <th>test</th> </tr></thead><tbody><tr><td>a</td></tr></tbody></table>"
expect(PrettyText.cook(table)).to match_html(match) expect(PrettyText.cook(table)).to match_html(match)