Merge branch 't/16821' into major

ckeditor · Mar 8, 2017 · 58726c6 · 58726c6
2 parents 747b932 + fbb65a7
commit 58726c6
Show file tree

Hide file tree

Showing 31 changed files with 7,205 additions and 10,853 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -11,6 +11,7 @@ New Features:
 
 Fixed Issues:
 
+* [#16821](http://dev.ckeditor.com/ticket/16821): Fixed: Extraneous `spans` with `height` style stacked when [pasting from Word](http://ckeditor.com/addon/pastefromword).
 * [#12465](http://dev.ckeditor.com/ticket/12465): Fixed: Can't change state of checkboxes/radio buttons if the properties dialog was invoked via double-click.
 * [#13062](http://dev.ckeditor.com/ticket/13062): Fixed: Impossible to unlink when the caret is at the edge of the link.
 * [#13585](http://dev.ckeditor.com/ticket/13585): Fixed: Error when wrapping two adjacent `<div>`s with a `<div>`.

diff --git a/plugins/pastefromword/filter/default.js b/plugins/pastefromword/filter/default.js
@@ -658,6 +658,7 @@
 			var retainedStyles = {
 				'list-style-type': true,
 				'width': true,
+				'height': true,
 				'border': true,
 				'border-': true
 			};

diff --git a/tests/plugins/pastefromword/generated/_fixtures/Table_alignment/expected.html b/tests/plugins/pastefromword/generated/_fixtures/Table_alignment/expected.html
@@ -2,14 +2,12 @@
 <table border="1" cellspacing="0">
 	<tbody>
 		<tr>
-			<td valign="top" style="height:31.0pt; width:134.75pt">
+			<td style="height:31.0pt; width:134.75pt" valign="top">
 				<p>
-					<span style="line-height:normal">
-						<span style="height:31.0pt">aa</span>
-					</span>
+					<span style="line-height:normal">aa</span>
 				</p>
 			</td>
-			<td valign="top" style="height:31.0pt; width:117.0pt">
+			<td style="height:31.0pt; width:117.0pt" valign="top">
 				<p>
 					<br />
 				</p>
@@ -18,17 +16,15 @@
 	</tbody>
 </table>
 <p>center</p>
-<table border="1" cellspacing="0" align="center">
+<table align="center" border="1" cellspacing="0">
 	<tbody>
 		<tr>
-			<td valign="top" style="height:31.0pt; width:134.75pt">
+			<td style="height:31.0pt; width:134.75pt" valign="top">
 				<p>
-					<span style="line-height:normal">
-						<span style="height:31.0pt">aa</span>
-					</span>
+					<span style="line-height:normal">aa</span>
 				</p>
 			</td>
-			<td valign="top" style="height:31.0pt; width:117.0pt">
+			<td style="height:31.0pt; width:117.0pt" valign="top">
 				<p>
 					<br />
 				</p>
@@ -37,17 +33,15 @@
 	</tbody>
 </table>
 <p>right</p>
-<table border="1" cellspacing="0" align="right">
+<table align="right" border="1" cellspacing="0">
 	<tbody>
 		<tr>
-			<td valign="top" style="height:31.0pt; width:134.75pt">
+			<td style="height:31.0pt; width:134.75pt" valign="top">
 				<p>
-					<span style="line-height:normal">
-						<span style="height:31.0pt">aa</span>
-					</span>
+					<span style="line-height:normal">aa</span>
 				</p>
 			</td>
-			<td valign="top" style="height:31.0pt; width:117.0pt">
+			<td style="height:31.0pt; width:117.0pt" valign="top">
 				<p>
 					<br />
 				</p>

diff --git a/tests/plugins/pastefromword/generated/_fixtures/Table_alignment/word2013/expected_ie11.html b/tests/plugins/pastefromword/generated/_fixtures/Table_alignment/word2013/expected_ie11.html
@@ -10,25 +10,21 @@
 		<tr>
 			<td style="height:31pt; width:134.75pt" valign="top">
 				<p style="margin-left:0in; margin-right:0in">
-					<span style="line-height:normal">
-						<span style="height:31pt">
-							<span style="color:#000000">
-								<span style="font-family:calibri">
-									<span style="font-size:medium">aa</span>
-								</span>
+					<span style="color:#000000">
+						<span style="font-family:calibri">
+							<span style="font-size:medium">
+								<span style="line-height:normal">aa</span>
 							</span>
 						</span>
 					</span>
 				</p>
 			</td>
 			<td style="border-color:windowtext windowtext windowtext #000000; height:31pt; width:117pt" valign="top">
 				<p style="margin-left:0in; margin-right:0in">
-					<span style="line-height:normal">
-						<span style="height:31pt">
-							<span style="color:#000000">
-								<span style="font-family:calibri">
-									<span style="font-size:medium">&nbsp;</span>
-								</span>
+					<span style="color:#000000">
+						<span style="font-family:calibri">
+							<span style="font-size:medium">
+								<span style="line-height:normal">&nbsp;</span>
 							</span>
 						</span>
 					</span>
@@ -49,25 +45,21 @@
 		<tr>
 			<td style="height:31pt; width:134.75pt" valign="top">
 				<p style="margin-left:0in; margin-right:0in">
-					<span style="line-height:normal">
-						<span style="height:31pt">
-							<span style="color:#000000">
-								<span style="font-family:calibri">
-									<span style="font-size:medium">aa</span>
-								</span>
+					<span style="color:#000000">
+						<span style="font-family:calibri">
+							<span style="font-size:medium">
+								<span style="line-height:normal">aa</span>
 							</span>
 						</span>
 					</span>
 				</p>
 			</td>
 			<td style="border-color:windowtext windowtext windowtext #000000; height:31pt; width:117pt" valign="top">
 				<p style="margin-left:0in; margin-right:0in">
-					<span style="line-height:normal">
-						<span style="height:31pt">
-							<span style="color:#000000">
-								<span style="font-family:calibri">
-									<span style="font-size:medium">&nbsp;</span>
-								</span>
+					<span style="color:#000000">
+						<span style="font-family:calibri">
+							<span style="font-size:medium">
+								<span style="line-height:normal">&nbsp;</span>
 							</span>
 						</span>
 					</span>
@@ -88,25 +80,21 @@
 		<tr>
 			<td style="height:31pt; width:134.75pt" valign="top">
 				<p style="margin-left:0in; margin-right:0in">
-					<span style="line-height:normal">
-						<span style="height:31pt">
-							<span style="color:#000000">
-								<span style="font-family:calibri">
-									<span style="font-size:medium">aa</span>
-								</span>
+					<span style="color:#000000">
+						<span style="font-family:calibri">
+							<span style="font-size:medium">
+								<span style="line-height:normal">aa</span>
 							</span>
 						</span>
 					</span>
 				</p>
 			</td>
 			<td style="border-color:windowtext windowtext windowtext #000000; height:31pt; width:117pt" valign="top">
 				<p style="margin-left:0in; margin-right:0in">
-					<span style="line-height:normal">
-						<span style="height:31pt">
-							<span style="color:#000000">
-								<span style="font-family:calibri">
-									<span style="font-size:medium">&nbsp;</span>
-								</span>
+					<span style="color:#000000">
+						<span style="font-family:calibri">
+							<span style="font-size:medium">
+								<span style="line-height:normal">&nbsp;</span>
 							</span>
 						</span>
 					</span>

diff --git a/tests/plugins/pastefromword/generated/_fixtures/Table_alignment/word2013/expected_ie8.html b/tests/plugins/pastefromword/generated/_fixtures/Table_alignment/word2013/expected_ie8.html
@@ -1,23 +1,21 @@
 <p style="margin-left:0in; margin-right:0in">
-	<span style="font-size:medium">
-		<span style="color:#000000">left</span>
+	<span style="color:#000000">
+		<span style="font-size:medium">left</span>
 	</span>
 </p>
 <table border="1" cellspacing="0">
 	<tbody>
 		<tr>
-			<td valign="top" style="height:31pt; width:134.75pt">
+			<td style="height:31pt; width:134.75pt" valign="top">
 				<p style="margin-left:0in; margin-right:0in">
-					<span style="line-height:normal">
-						<span style="height:31pt">
-							<span style="font-size:medium">
-								<span style="color:#000000">aa</span>
-							</span>
+					<span style="color:#000000">
+						<span style="font-size:medium">
+							<span style="line-height:normal">aa</span>
 						</span>
 					</span>
 				</p>
 			</td>
-			<td valign="top" style="height:31pt; width:117pt">
+			<td style="height:31pt; width:117pt" valign="top">
 				<p style="margin-left:0in; margin-right:0in">
 					<br />
 				</p>
@@ -26,25 +24,23 @@
 	</tbody>
 </table>
 <p style="margin-left:0in; margin-right:0in">
-	<span style="font-size:medium">
-		<span style="color:#000000">center</span>
+	<span style="color:#000000">
+		<span style="font-size:medium">center</span>
 	</span>
 </p>
 <table align="center" border="1" cellspacing="0">
 	<tbody>
 		<tr>
-			<td valign="top" style="height:31pt; width:134.75pt">
+			<td style="height:31pt; width:134.75pt" valign="top">
 				<p style="margin-left:0in; margin-right:0in">
-					<span style="line-height:normal">
-						<span style="height:31pt">
-							<span style="font-size:medium">
-								<span style="color:#000000">aa</span>
-							</span>
+					<span style="color:#000000">
+						<span style="font-size:medium">
+							<span style="line-height:normal">aa</span>
 						</span>
 					</span>
 				</p>
 			</td>
-			<td valign="top" style="height:31pt; width:117pt">
+			<td style="height:31pt; width:117pt" valign="top">
 				<p style="margin-left:0in; margin-right:0in">
 					<br />
 				</p>
@@ -53,25 +49,23 @@
 	</tbody>
 </table>
 <p style="margin-left:0in; margin-right:0in">
-	<span style="font-size:medium">
-		<span style="color:#000000">right</span>
+	<span style="color:#000000">
+		<span style="font-size:medium">right</span>
 	</span>
 </p>
 <table align="right" border="1" cellspacing="0">
 	<tbody>
 		<tr>
-			<td valign="top" style="height:31pt; width:134.75pt">
+			<td style="height:31pt; width:134.75pt" valign="top">
 				<p style="margin-left:0in; margin-right:0in">
-					<span style="line-height:normal">
-						<span style="height:31pt">
-							<span style="font-size:medium">
-								<span style="color:#000000">aa</span>
-							</span>
+					<span style="color:#000000">
+						<span style="font-size:medium">
+							<span style="line-height:normal">aa</span>
 						</span>
 					</span>
 				</p>
 			</td>
-			<td valign="top" style="height:31pt; width:117pt">
+			<td style="height:31pt; width:117pt" valign="top">
 				<p style="margin-left:0in; margin-right:0in">
 					<br />
 				</p>

diff --git a/tests/plugins/pastefromword/generated/_fixtures/Table_vertical_alignment/expected.html b/tests/plugins/pastefromword/generated/_fixtures/Table_vertical_alignment/expected.html
@@ -3,10 +3,14 @@
 	<tbody>
 		<tr>
 			<td style="height:49.0pt; width:233.75pt" valign="top">
-				<p><span style="line-height:normal"><span style="height:49.0pt">foo</span></span></p>
+				<p>
+					<span style="line-height:normal">foo</span>
+				</p>
 			</td>
 			<td style="height:49.0pt; width:233.75pt" valign="top">
-				<p><span style="line-height:normal"><span style="height:49.0pt">bar</span></span></p>
+				<p>
+					<span style="line-height:normal">bar</span>
+				</p>
 			</td>
 		</tr>
 	</tbody>
@@ -19,10 +23,14 @@
 	<tbody>
 		<tr>
 			<td style="height:49.0pt; width:233.75pt" valign="top">
-				<p><span style="line-height:normal"><span style="height:49.0pt">foo</span></span></p>
+				<p>
+					<span style="line-height:normal">foo</span>
+				</p>
 			</td>
 			<td style="height:49.0pt; width:233.75pt" valign="top">
-				<p><span style="line-height:normal"><span style="height:49.0pt">bar</span></span></p>
+				<p>
+					<span style="line-height:normal">bar</span>
+				</p>
 			</td>
 		</tr>
 	</tbody>
@@ -35,10 +43,14 @@
 	<tbody>
 		<tr>
 			<td style="height:49.0pt; width:233.75pt" valign="bottom">
-				<p><span style="line-height:normal"><span style="height:49.0pt">foo</span></span></p>
+				<p>
+					<span style="line-height:normal">foo</span>
+				</p>
 			</td>
 			<td style="height:49.0pt; width:233.75pt" valign="top">
-				<p><span style="line-height:normal"><span style="height:49.0pt">bar</span></span></p>
+				<p>
+					<span style="line-height:normal">bar</span>
+				</p>
 			</td>
 		</tr>
 	</tbody>
@@ -51,10 +63,14 @@
 	<tbody>
 		<tr>
 			<td style="height:49.0pt; width:233.75pt">
-				<p><span style="line-height:normal"><span style="height:49.0pt">foo</span></span></p>
+				<p>
+					<span style="line-height:normal">foo</span>
+				</p>
 			</td>
 			<td style="height:49.0pt; width:233.75pt" valign="top">
-				<p><span style="line-height:normal"><span style="height:49.0pt">bar</span></span></p>
+				<p>
+					<span style="line-height:normal">bar</span>
+				</p>
 			</td>
 		</tr>
 	</tbody>