wordcontenthandler: Remove alignment (#1606)

SUP-6082
alohaeditor · May 2, 2018 · 4de152e · 4de152e
1 parent 31988ad
commit 4de152e
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 3 deletions.
diff --git a/build/changelog/entries/2018/03/12349.SUP-6082.bugfix b/build/changelog/entries/2018/03/12349.SUP-6082.bugfix
@@ -0,0 +1 @@
+wordcontenthandler: Removed alignment when pasting aligned text from Word.
diff --git a/src/plugins/common/contenthandler/lib/wordcontenthandler.js b/src/plugins/common/contenthandler/lib/wordcontenthandler.js
@@ -230,6 +230,8 @@ define([
 			} else if (nodeName === 'a'
 					&& $node.attr('href') && $node.attr('href').match("^file://")) {
 				$node.contents().unwrap();
+			} else if (nodeName === 'p' && $node.attr('align')) {
+				$node.removeAttr('align');
 			}
 		}
 

diff --git a/src/test/unit/wordcontenthandler.html b/src/test/unit/wordcontenthandler.html
@@ -43,16 +43,19 @@
 			defaultCommand: 'inserthtml',
 			label: 'wordcontenthandler',
 			tests: [ ]
-	}
+		},
+		defaultAttributes = ['class','id']
 
 	// now add tests for copy & paste from different sources (from './wordcontenthandler/<name>-[start|expected|value].html' files)
-	files = [ 'word1', 'word2', 'word3', 'word4', 'word5', 'word6', 'word7', 'word8', 'word9', 'word10', 'word11', 'word12', 'word13', 'word14', 'word15', 'word16' ];
+	files = [ 'word1', 'word2', 'word3', 'word4', 'word5', 'word6', 'word7', 'word8', 'word9', 'word10', 'word11', 'word12', 'word13', 'word14', 'word15', 'word16', 'word17' ];
+
 	elements = [ 'div' ];
 
 	for ( i=0; i<files.length; i++ ) {
 		var data_start, 
 			data_expected,
 			data_value,
+			data_attributes,
 			file_expected,
 			index;
 
@@ -78,11 +81,21 @@
 				data_value = data;
 		}} );
 
+		jQuery.ajax( {url: 'wordcontenthandler/' + file +'-attributes.html', async: false, success: function(data) {
+				data_attributes = data.split(',');
+				data_attributes.concat(defaultAttributes);
+		}} );
+
+		if (typeof data_attributes == undefined) {
+			data_attributes = defaultAttributes;
+		}
+
 		for ( j=0; j<elements.length; j++ ) {
 			tests.tests.push({
 				start: '<' + elements[ j ] + '>' + data_start + '</' + elements[ j ] + '>',
 				execResult: '<' + elements[ j ] + '>' + data_expected + '</' + elements[ j ] + '>',
-				value: data_value
+				value: data_value,
+				attributes: data_attributes
 			});
 		}
 

diff --git a/src/test/unit/wordcontenthandler/word17-attributes.html b/src/test/unit/wordcontenthandler/word17-attributes.html
@@ -0,0 +1 @@
+align
diff --git a/src/test/unit/wordcontenthandler/word17-expected.html b/src/test/unit/wordcontenthandler/word17-expected.html
@@ -0,0 +1 @@
+<p class="">center</p>{}
diff --git a/src/test/unit/wordcontenthandler/word17-start.html b/src/test/unit/wordcontenthandler/word17-start.html
@@ -0,0 +1 @@
+{}
diff --git a/src/test/unit/wordcontenthandler/word17-value.html b/src/test/unit/wordcontenthandler/word17-value.html
@@ -0,0 +1 @@
+<p class="MsoNormal" align="center" style="text-align:center"><span lang="DE-AT">center<o:p></o:p></span></p>