From dbec08cc566955734c714ae7a55730b47ad70b9d Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Wed, 8 Jul 2015 11:04:13 +0200 Subject: [PATCH] Revert "Removed debug code" This reverts commit e04f22e721e741c71ec4ed513ac6ad6d2d40e8d4. --- .../files/js/3rdParty/redactor/redactor.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/wcfsetup/install/files/js/3rdParty/redactor/redactor.js b/wcfsetup/install/files/js/3rdParty/redactor/redactor.js index 77da0f2290..f3dc12ac15 100644 --- a/wcfsetup/install/files/js/3rdParty/redactor/redactor.js +++ b/wcfsetup/install/files/js/3rdParty/redactor/redactor.js @@ -1984,7 +1984,7 @@ html = html.replace(/\$/g, '$'); // replace special characters in links - html = html.replace(//gi, ''); + html = html.replace(//gi, ''); if (this.opts.replaceDivs) html = this.clean.replaceDivs(html); if (this.opts.linebreaks) html = this.clean.replaceParagraphsToBr(html); @@ -2155,10 +2155,10 @@ if (this.utils.isCurrentOrParent('PRE')) { - html = html.replace(/���/g, '"'); - html = html.replace(/���/g, '"'); - html = html.replace(/���/g, '\''); - html = html.replace(/���/g, '\''); + html = html.replace(/”/g, '"'); + html = html.replace(/“/g, '"'); + html = html.replace(/‘/g, '\''); + html = html.replace(/’/g, '\''); return this.clean.getPreCode(html); } @@ -2341,7 +2341,7 @@ html = $div.html(); // remove ms word's bullet - html = html.replace(/��/g, ''); + html = html.replace(/·/g, ''); html = html.replace(/

/gi, ''); // bullets - html = html.replace(/

���([\w\W]*?)<\/p>/gi, '

  • $1
  • '); + html = html.replace(/

    •([\w\W]*?)<\/p>/gi, '

  • $1
  • '); // FF fix if (this.utils.browser('mozilla')) @@ -2586,7 +2586,7 @@ }, restoreSelectionMarker: function(html) { - html = html.replace(/<span id="selection-marker-([0-9])" class="redactor-selection-marker" data-verified="redactor">���<\/span>/g, '���'); + html = html.replace(/<span id="selection-marker-([0-9])" class="redactor-selection-marker" data-verified="redactor">​<\/span>/g, '​'); return html; }, @@ -2985,6 +2985,8 @@ else { this.$textarea.height(height).show().focus(); + console.debug(height); + console.debug(this.$textarea[0].outerHTML); this.$textarea.on('keydown.redactor-textarea-indenting', this.code.textareaIndenting); $(window).scrollTop(scroll); -- 2.20.1