From ae5eb74bb46343e7b1e9dfb391e99c3f75736472 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Sat, 18 Jun 2016 18:58:06 +0200 Subject: [PATCH] Fixed callbacks for bbcode<->html conversion --- .../js/3rdParty/redactor/plugins/wbbcode.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js index c0393dce6c..f2e43567a1 100644 --- a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js +++ b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js @@ -326,7 +326,9 @@ RedactorPlugins.wbbcode = function() { convertFromHtml: function(html) { var $searchFor = [ ]; - WCF.System.Event.fireEvent('com.woltlab.wcf.redactor', 'beforeConvertFromHtml', { html: html }); + var parameters = { html: html }; + WCF.System.Event.fireEvent('com.woltlab.wcf.redactor', 'beforeConvertFromHtml', parameters); + html = parameters.html; // remove data-redactor-tag="" attribute html = html.replace(/(<[^>]+?) data-redactor-tag="[^"]+"/g, '$1'); @@ -860,7 +862,9 @@ RedactorPlugins.wbbcode = function() { html = html.replace(/%28/g, '('); html = html.replace(/%29/g, ')'); - WCF.System.Event.fireEvent('com.woltlab.wcf.redactor', 'afterConvertFromHtml', { html: html }); + parameters = { html: html }; + WCF.System.Event.fireEvent('com.woltlab.wcf.redactor', 'afterConvertFromHtml', parameters); + html = parameters.html; // remove all leading and trailing whitespaces, but add one empty line at the end html = $.trim(html); @@ -877,7 +881,9 @@ RedactorPlugins.wbbcode = function() { * @param string data */ convertToHtml: function(data) { - WCF.System.Event.fireEvent('com.woltlab.wcf.redactor', 'beforeConvertToHtml', { data: data }); + var parameters = { data: data }; + WCF.System.Event.fireEvent('com.woltlab.wcf.redactor', 'beforeConvertToHtml', parameters); + data = parameters.data; // remove 0x200B (unicode zero width space) data = this.wutil.removeZeroWidthSpace(data); @@ -1502,11 +1508,13 @@ RedactorPlugins.wbbcode = function() { } } - WCF.System.Event.fireEvent('com.woltlab.wcf.redactor', 'afterConvertToHtml', { data: data }); - // double-encode the ampersand, otherwise Redactor removes it data = data.replace(/&nbsp;/g, '&amp;nbsp;'); + parameters = { data: data }; + WCF.System.Event.fireEvent('com.woltlab.wcf.redactor', 'afterConvertToHtml', parameters); + data = parameters.data; + return data; }, -- 2.20.1