From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 30 Aug 2016 09:43:19 +0000 (+0200)
Subject: Removing spans again
X-Git-Tag: 3.0.0_Beta_1~410
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0f0d9e0dc7f7545a158e0e01513815d8783d0657;p=GitHub%2FWoltLab%2FWCF.git

Removing spans again
---

diff --git a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabClean.js b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabClean.js
index 383a377908..02c15009cf 100644
--- a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabClean.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabClean.js
@@ -3,6 +3,10 @@ $.Redactor.prototype.WoltLabClean = function() {
 	
 	return {
 		init: function () {
+			this.opts.pasteInlineTags = this.opts.pasteInlineTags.filter(function (value) {
+				return (value !== 'span');
+			});
+			
 			var mpOnSet = this.clean.onSet;
 			this.clean.onSet = (function (html) {
 				return mpOnSet.call(this, html.replace(/\u200B/g, ''));
@@ -10,9 +14,10 @@ $.Redactor.prototype.WoltLabClean = function() {
 			
 			var mpOnSync = this.clean.onSync;
 			this.clean.onSync = (function (html) {
-				var div, replacements = {};
+				var div = elCreate('div');
+				var replacements = {};
+				
 				if (html.indexOf('<pre') !== -1) {
-					div = elCreate('div');
 					div.innerHTML = html;
 					
 					elBySelAll('pre', div, function (pre) {
@@ -27,15 +32,18 @@ $.Redactor.prototype.WoltLabClean = function() {
 				
 				html = mpOnSync.call(this, html);
 				
-				if (div) {
-					div.innerHTML = html;
-					
-					elBySelAll('pre', div, function (pre) {
+				div.innerHTML = html;
+				
+				elBySelAll('span', div, function (span) {
+					span.outerHTML = span.innerHTML;
+				});
+				elBySelAll('pre', div, function (pre) {
+					if (replacements.hasOwnProperty(pre.textContent)) {
 						pre.textContent = replacements[pre.textContent];
-					});
-					
-					html = div.innerHTML;
-				}
+					}
+				});
+				
+				html = div.innerHTML;
 				
 				return html;
 			}).bind(this);
@@ -54,6 +62,15 @@ $.Redactor.prototype.WoltLabClean = function() {
 				
 				return html;
 			}).bind(this);
+			
+			var mpStripTags = this.clean.stripTags;
+			this.clean.stripTags = (function(input, denied) {
+				if (Array.isArray(denied)) {
+					denied.push('span');
+				}
+				
+				return mpStripTags.call(this, input, denied);
+			}).bind(this);
 		}
 	}
 };