moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

made getAttrs correctly handle both ' and "

This commit is contained in:
Henry Jameson 2021-06-07 16:31:39 +03:00
parent 22c8f71945
commit b0ae32e309
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/services/mini_html_converter/mini_html_converter.service.js
View File

@ -128,11 +128,11 @@ export const getAttrs = tag => {
.replace(new RegExp('^' + getTagName(tag)), '') .replace(new RegExp('^' + getTagName(tag)), '')
.replace(/\/?$/, '') .replace(/\/?$/, '')
.trim() .trim()
const attrs = Array.from(innertag.matchAll(/([a-z0-9-]+)(?:=(?:"([^"]+?)"|'([^']+?)'))?/gi)) const attrs = Array.from(innertag.matchAll(/([a-z0-9-]+)(?:=("[^"]+?"|'[^']+?'))?/gi))
.map(([trash, key, value]) => [key, value]) .map(([trash, key, value]) => [key, value])
.map(([k, v]) => { .map(([k, v]) => {
if (!v) return [k, true] if (!v) return [k, true]
return [k, v] return [k, v.substring(1, v.length - 1)]
}) })
return Object.fromEntries(attrs) return Object.fromEntries(attrs)
} }

2
test/unit/specs/services/tiny_post_html_processor/mini_post_html_processor.spec.js
View File

@ -157,7 +157,7 @@ describe('MiniHtmlConverter', () => {
describe('getAttrs', () => { describe('getAttrs', () => {
it('extracts arguments from tag', () => { it('extracts arguments from tag', () => {
const input = '<img src="boop" cool ebin="true">' const input = '<img src="boop" cool ebin=\'true\'>'
const output = { src: 'boop', cool: true, ebin: 'true' } const output = { src: 'boop', cool: true, ebin: 'true' }
expect(getAttrs(input)).to.eql(output) expect(getAttrs(input)).to.eql(output)