github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-29 11:48:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: support quotes for poll parameters

Browse Source
This commit is contained in:
Régis Hanol
2015-05-07 16:40:14 +02:00
parent 78cff468bc
commit 9b0ca60f52
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/poll/assets/javascripts/poll_dialect.js
View File

@ -8,7 +8,7 @@
const WHITELISTED_ATTRIBUTES = ["type", "name", "min", "max", "step", "order", "color", "background", "status"];
const WHITELISTED_STYLES = ["color", "background"];
const ATTRIBUTES_REGEX = new RegExp("(" + WHITELISTED_ATTRIBUTES.join("|") + ")=[^\\s\\]]+", "g");
const ATTRIBUTES_REGEX = new RegExp("(" + WHITELISTED_ATTRIBUTES.join("|") + ")=['\"]?[^\\s\\]]+['\"]?", "g");
Discourse.Dialect.replaceBlock({
start: /\[poll([^\]]*)\]([\s\S]*)/igm,
@ -44,8 +44,9 @@
// extract poll attributes
(matches[1].match(ATTRIBUTES_REGEX) || []).forEach(function(m) {
var attr = m.split("=");
attributes[DATA_PREFIX + attr[0]] = attr[1];
var attr = m.split("="), name = attr[0], value = attr[1];
value = value.replace(/["']/g, "");
attributes[DATA_PREFIX + name] = value;
});
// we might need these values later...