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

Clean up validateAttribute() function 

Remove code duplication
This commit is contained in:
riking 2014-10-05 12:06:04 -07:00 committed by Kane York
parent 32cc31319f
commit 0586b3dd25
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/assets/javascripts/discourse/lib/markdown.js
View File

@ -52,28 +52,28 @@ function validateAttribute(tagName, attribName, value) {
// Handle classes // Handle classes
if (attribName === "class") { if (attribName === "class") {
if (_validClasses[value]) { return value; } if (_validClasses[value]) { return value; }
}
if (tag) { if (attribName.indexOf('data-') === 0) {
var classes = tag['class']; // data-* catch-all validators
if (classes && (classes.indexOf(value) !== -1 || classes.indexOf('*') !== -1)) { if (tag && tag['data-*'] && !tag[attribName]) {
var permitted = tag['data-*'];
if (permitted === value || permitted === '*' ||
((permitted instanceof RegExp) && permitted.test(value))) {
return value; return value;
} }
} }
} else if (attribName.indexOf('data-') === 0) {
// data-* attributes
if (tag) {
var allowed = tag[attribName] || tag['data-*'];
if (allowed && (allowed === value || allowed.indexOf('*') !== -1)) { return value; }
}
} }
if (tag) { if (tag) {
var attrs = tag[attribName]; var attrs = tag[attribName];
if (attrs && (attrs.indexOf(value) !== -1 || if (attrs && (attrs.indexOf(value) !== -1 ||
attrs.indexOf('*') !== -1) || attrs.indexOf('*') !== -1) ||
_.any(attrs,function(r){return (r instanceof RegExp) && value.search(r) >= 0;}) _.any(attrs, function(r) { return (r instanceof RegExp) && r.test(value); })
) { return value; } ) { return value; }
} }
// return undefined;
} }
function anchorRegexp(regex) { function anchorRegexp(regex) {