Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow whitespace around % scaler in markdown image syntax (#5000)

This commit is contained in:
David Taylor 2017-07-26 15:54:20 +01:00 committed by Sam
parent febd7621ea
commit 27539e15e1
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js.es6
View File

@ -104,7 +104,7 @@ function setupHoister(md) {
md.renderer.rules.html_raw = renderHoisted;
}
const IMG_SIZE_REGEX = /^([1-9]+[0-9]*)x([1-9]+[0-9]*)(,([1-9][0-9]?)%)?$/;
const IMG_SIZE_REGEX = /^([1-9]+[0-9]*)x([1-9]+[0-9]*)(\s*,\s*([1-9][0-9]?)%)?$/;
function renderImage(tokens, idx, options, env, slf) {
var token = tokens[idx];

15
spec/components/pretty_text_spec.rb
View File

@ -970,6 +970,21 @@ HTML
expect(cooked).to eq(html.strip)
end
it "allows whitespace before the percent scaler" do
cooked = PrettyText.cook <<~MD
![|220x100, 50%](http://png.com/my.png)
![|220x100 , 50%](http://png.com/my.png)
![|220x100 ,50%](http://png.com/my.png)
MD
html = <<~HTML
<p><img src="http://png.com/my.png" alt width="110" height="50">
<img src="http://png.com/my.png" alt width="110" height="50">
<img src="http://png.com/my.png" alt width="110" height="50"></p>
HTML
end
end
describe "inline onebox" do