osr-plastic/osr-discourse-src
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

BUGFIX: spoiler tag on lightboxed images wasn't working

Browse Source
This commit is contained in:
Régis Hanol
2014-01-12 19:38:46 +01:00
parent 090d7e2695
commit 70161498b6
5 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/discourse/dialects/bbcode_dialect.js
+8 -3
View File
@@ -57,8 +57,6 @@ replaceBBCode('ul', function(contents) { return ['ul'].concat(contents); });
replaceBBCode('ol', function(contents) { return ['ol'].concat(contents); });
replaceBBCode('li', function(contents) { return ['li'].concat(contents); });
replaceBBCode('spoiler', function(contents) { return ['span', {'class': 'spoiler'}].concat(contents); });
Discourse.Dialect.inlineBetween({
start: '[img]',
stop: '[/img]',
@@ -80,7 +78,6 @@ Discourse.Dialect.inlineBetween({
emitter: function(contents) { return ['a', {href: contents, 'data-bbcode': true}, contents]; }
});
replaceBBCodeParamsRaw("url", function(param, contents) {
return ['a', {href: param, 'data-bbcode': true}, contents];
});
@@ -103,3 +100,11 @@ Discourse.Dialect.replaceBlock({
}
});
Discourse.Dialect.replaceBlock({
start: /(\[spoiler\])([\s\S]*)/igm,
stop: '[/spoiler]',
emitter: function(blockContents) {
return ['p', ['div', { 'class': 'spoiler' }, blockContents.join("\n")]];
}
});