Skip to content

Commit

Permalink
Merge branch 't/16818' into major
Browse files Browse the repository at this point in the history
  • Loading branch information
@Tade0
Tade0 committed Jan 24, 2017
2 parents 0c8848e + 05e6255 commit 8c3adbb
Show file tree
Hide file tree
Showing 29 changed files with 11,092 additions and 421 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
View file
Expand Up @@ -19,6 +19,7 @@ New Features:

Fixed Issues:

* [#16818](http://dev.ckeditor.com/ticket/16818): Fixed: Table cell height not parsed properly by the [Paste from Word](http://ckeditor.com/addon/pastefromword) plugin.
* [#13446](http://dev.ckeditor.com/ticket/13446): [Chrome] Fixed: It is possible to type in an unfocused inline editor.
* [#14856](http://dev.ckeditor.com/ticket/14856): Fixed: [Font size and font family](http://ckeditor.com/addon/font) reset each other when modified at certain positions.
* [#16745](http://dev.ckeditor.com/ticket/16745): [Edge] Fixed: List items are lost when [pasted from Word](http://ckeditor.com/addon/pastefromword).
Expand Down
34 changes: 33 additions & 1 deletion plugins/tabletools/plugin.js
View file
Expand Up @@ -681,7 +681,39 @@
delete element.attributes.valign;
}
}
] ]
], [
{
// (#16818)
element: 'tr',
check: 'td{height}',
left: function( element ) {
return element.styles && element.styles.height;
},
right: function( element ) {
CKEDITOR.tools.array.forEach( element.children, function( node ) {
if ( node.name in { td: 1, th: 1 } ) {
node.attributes[ 'cke-row-height' ] = element.styles.height;
}
} );

delete element.styles.height;
}
}
], [
{
// (#16818)
element: 'td',
check: 'td{height}',
left: function( element ) {
var attributes = element.attributes;
return attributes && attributes[ 'cke-row-height' ];
},
right: function( element ) {
element.styles.height = element.attributes[ 'cke-row-height' ];
delete element.attributes[ 'cke-row-height' ];
}
}
] ]
} ) ) );
CKEDITOR.dialog.add( 'cellProperties', this.path + 'dialogs/tableCell.js' );

Expand Down
12 changes: 6 additions & 6 deletions tests/plugins/pastefromword/generated/_fixtures/Table_alignment/expected.html
View file
Expand Up @@ -2,14 +2,14 @@
<table border="1" cellspacing="0">
<tbody>
<tr>
<td valign="top" style="width:134.75pt">
<td valign="top" style="height:31.0pt; width:134.75pt">
<p>
<span style="line-height:normal">
<span style="height:31.0pt">aa</span>
</span>
</p>
</td>
<td valign="top" style="width:117.0pt">
<td valign="top" style="height:31.0pt; width:117.0pt">
<p>
<br />
</p>
Expand All @@ -21,14 +21,14 @@
<table border="1" cellspacing="0" align="center">
<tbody>
<tr>
<td valign="top" style="width:134.75pt">
<td valign="top" style="height:31.0pt; width:134.75pt">
<p>
<span style="line-height:normal">
<span style="height:31.0pt">aa</span>
</span>
</p>
</td>
<td valign="top" style="width:117.0pt">
<td valign="top" style="height:31.0pt; width:117.0pt">
<p>
<br />
</p>
Expand All @@ -40,14 +40,14 @@
<table border="1" cellspacing="0" align="right">
<tbody>
<tr>
<td valign="top" style="width:134.75pt">
<td valign="top" style="height:31.0pt; width:134.75pt">
<p>
<span style="line-height:normal">
<span style="height:31.0pt">aa</span>
</span>
</p>
</td>
<td valign="top" style="width:117.0pt">
<td valign="top" style="height:31.0pt; width:117.0pt">
<p>
<br />
</p>
Expand Down
12 changes: 6 additions & 6 deletions tests/plugins/pastefromword/generated/_fixtures/Table_alignment/word2013/expected_ie11.html
View file
Expand Up @@ -8,7 +8,7 @@
<table border="1" cellspacing="0">
<tbody>
<tr>
<td valign="top" style="width:134.75pt">
<td valign="top" style="height:31pt; width:134.75pt">
<p style="margin-left:0in; margin-right:0in">
<span style="line-height:normal">
<span style="height:31pt">
Expand All @@ -21,7 +21,7 @@
</span>
</p>
</td>
<td valign="top" style="border-color:windowtext windowtext windowtext #000000; width:117pt">
<td valign="top" style="height:31pt; border-color:windowtext windowtext windowtext #000000; width:117pt">
<p style="margin-left:0in; margin-right:0in">
<br />
</p>
Expand All @@ -39,7 +39,7 @@
<table align="center" border="1" cellspacing="0">
<tbody>
<tr>
<td valign="top" style="width:134.75pt">
<td valign="top" style="height:31pt; width:134.75pt">
<p style="margin-left:0in; margin-right:0in">
<span style="line-height:normal">
<span style="height:31pt">
Expand All @@ -52,7 +52,7 @@
</span>
</p>
</td>
<td valign="top" style="border-color:windowtext windowtext windowtext #000000; width:117pt">
<td valign="top" style="height:31pt; border-color:windowtext windowtext windowtext #000000; width:117pt">
<p style="margin-left:0in; margin-right:0in">
<br />
</p>
Expand All @@ -70,7 +70,7 @@
<table align="right" border="1" cellspacing="0">
<tbody>
<tr>
<td valign="top" style="width:134.75pt">
<td valign="top" style="height:31pt; width:134.75pt">
<p style="margin-left:0in; margin-right:0in">
<span style="line-height:normal">
<span style="height:31pt">
Expand All @@ -83,7 +83,7 @@
</span>
</p>
</td>
<td valign="top" style="border-color:windowtext windowtext windowtext #000000; width:117pt">
<td valign="top" style="height:31pt; border-color:windowtext windowtext windowtext #000000; width:117pt">
<p style="margin-left:0in; margin-right:0in">
<br />
</p>
Expand Down
12 changes: 6 additions & 6 deletions tests/plugins/pastefromword/generated/_fixtures/Table_alignment/word2013/expected_ie8.html
View file
Expand Up @@ -6,7 +6,7 @@
<table border="1" cellspacing="0">
<tbody>
<tr>
<td valign="top" style="width:134.75pt">
<td valign="top" style="height:31pt; width:134.75pt">
<p style="margin-left:0in; margin-right:0in">
<span style="line-height:normal">
<span style="height:31pt">
Expand All @@ -17,7 +17,7 @@
</span>
</p>
</td>
<td valign="top" style="width:117pt">
<td valign="top" style="height:31pt; width:117pt">
<p style="margin-left:0in; margin-right:0in">
<br />
</p>
Expand All @@ -33,7 +33,7 @@
<table align="center" border="1" cellspacing="0">
<tbody>
<tr>
<td valign="top" style="width:134.75pt">
<td valign="top" style="height:31pt; width:134.75pt">
<p style="margin-left:0in; margin-right:0in">
<span style="line-height:normal">
<span style="height:31pt">
Expand All @@ -44,7 +44,7 @@
</span>
</p>
</td>
<td valign="top" style="width:117pt">
<td valign="top" style="height:31pt; width:117pt">
<p style="margin-left:0in; margin-right:0in">
<br />
</p>
Expand All @@ -60,7 +60,7 @@
<table align="right" border="1" cellspacing="0">
<tbody>
<tr>
<td valign="top" style="width:134.75pt">
<td valign="top" style="height:31pt; width:134.75pt">
<p style="margin-left:0in; margin-right:0in">
<span style="line-height:normal">
<span style="height:31pt">
Expand All @@ -71,7 +71,7 @@
</span>
</p>
</td>
<td valign="top" style="width:117pt">
<td valign="top" style="height:31pt; width:117pt">
<p style="margin-left:0in; margin-right:0in">
<br />
</p>
Expand Down
16 changes: 8 additions & 8 deletions tests/plugins/pastefromword/generated/_fixtures/Table_vertical_alignment/expected.html
View file
Expand Up @@ -2,10 +2,10 @@
<table border="1" cellspacing="0">
<tbody>
<tr>
<td style="width:233.75pt" valign="top">
<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>
</td>
<td style="width:233.75pt" valign="top">
<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>
</td>
</tr>
Expand All @@ -18,10 +18,10 @@
<table border="1" cellspacing="0">
<tbody>
<tr>
<td style="width:233.75pt" valign="top">
<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>
</td>
<td style="width:233.75pt" valign="top">
<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>
</td>
</tr>
Expand All @@ -34,10 +34,10 @@
<table border="1" cellspacing="0">
<tbody>
<tr>
<td style="width:233.75pt" valign="bottom">
<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>
</td>
<td style="width:233.75pt" valign="top">
<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>
</td>
</tr>
Expand All @@ -50,10 +50,10 @@
<table border="1" cellspacing="0">
<tbody>
<tr>
<td style="width:233.75pt">
<td style="height:49.0pt; width:233.75pt">
<p><span style="line-height:normal"><span style="height:49.0pt">foo</span></span></p>
</td>
<td style="width:233.75pt" valign="top">
<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>
</td>
</tr>
Expand Down
16 changes: 8 additions & 8 deletions ...ns/pastefromword/generated/_fixtures/Table_vertical_alignment/word2007/expected_ie11.html
View file
Expand Up @@ -8,7 +8,7 @@
<table border="1" cellspacing="0">
<tbody>
<tr>
<td style="width:233.75pt" valign="top">
<td style="height:49pt; width:233.75pt" valign="top">
<p style="margin-left:0in; margin-right:0in">
<span style="line-height:normal">
<span style="height:49pt">
Expand All @@ -21,7 +21,7 @@
</span>
</p>
</td>
<td style="border-color:windowtext windowtext windowtext #000000; width:233.75pt" valign="top">
<td style="height:49pt; border-color:windowtext windowtext windowtext #000000; width:233.75pt" valign="top">
<p style="margin-left:0in; margin-right:0in">
<span style="line-height:normal">
<span style="height:49pt">
Expand Down Expand Up @@ -50,7 +50,7 @@
<table border="1" cellspacing="0">
<tbody>
<tr>
<td style="width:233.75pt" valign="top">
<td style="height:49pt; width:233.75pt" valign="top">
<p style="margin-left:0in; margin-right:0in">
<span style="line-height:normal">
<span style="height:49pt">
Expand All @@ -63,7 +63,7 @@
</span>
</p>
</td>
<td style="border-color:windowtext windowtext windowtext #000000; width:233.75pt" valign="top">
<td style="height:49pt; border-color:windowtext windowtext windowtext #000000; width:233.75pt" valign="top">
<p style="margin-left:0in; margin-right:0in">
<span style="line-height:normal">
<span style="height:49pt">
Expand Down Expand Up @@ -92,7 +92,7 @@
<table border="1" cellspacing="0">
<tbody>
<tr>
<td style="width:233.75pt" valign="bottom">
<td style="height:49pt; width:233.75pt" valign="bottom">
<p style="margin-left:0in; margin-right:0in">
<span style="line-height:normal">
<span style="height:49pt">
Expand All @@ -105,7 +105,7 @@
</span>
</p>
</td>
<td style="border-color:windowtext windowtext windowtext #000000; width:233.75pt" valign="top">
<td style="height:49pt; border-color:windowtext windowtext windowtext #000000; width:233.75pt" valign="top">
<p style="margin-left:0in; margin-right:0in">
<span style="line-height:normal">
<span style="height:49pt">
Expand Down Expand Up @@ -134,7 +134,7 @@
<table border="1" cellspacing="0">
<tbody>
<tr>
<td style="width:233.75pt">
<td style="height:49pt; width:233.75pt">
<p style="margin-left:0in; margin-right:0in">
<span style="line-height:normal">
<span style="height:49pt">
Expand All @@ -147,7 +147,7 @@
</span>
</p>
</td>
<td style="border-color:windowtext windowtext windowtext #000000; width:233.75pt" valign="top">
<td style="height:49pt; border-color:windowtext windowtext windowtext #000000; width:233.75pt" valign="top">
<p style="margin-left:0in; margin-right:0in">
<span style="line-height:normal">
<span style="height:49pt">
Expand Down
2 changes: 1 addition & 1 deletion tests/plugins/pastefromword/generated/_fixtures/Tickets/11950Test_Table/expected.html
View file
@@ -1 +1 @@
<table border="1" cellspacing="0" style="width:2.0in"><tbody><tr><td style="background-color:#5b9bd5; width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><strong><span style="color:white">column1</span></strong></span></span></p></td><td style="background-color:#5b9bd5; width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><strong><span style="color:white">column2</span></strong></span></span></p></td><td style="background-color:#5b9bd5; width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><strong><span style="color:white">column3</span></strong></span></span></p></td></tr><tr><td style="width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><span style="color:black">header 1</span></span></span></p></td><td style="width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><span style="color:black">header 2</span></span></span></p></td><td style="width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><span style="color:black">header 3</span></span></span></p></td></tr><tr><td style="width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><span style="color:black">data 1a</span></span></span></p></td><td style="width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><span style="color:black">data 1b</span></span></span></p></td><td style="width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><span style="color:black">data 1c</span></span></span></p></td></tr><tr><td style="width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><span style="color:black">data 2a</span></span></span></p></td><td style="width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><span style="color:black">data 2b</span></span></span></p></td><td style="width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><span style="color:black">data 2c</span></span></span></p></td></tr><tr><td style="width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><span style="color:black">data 3a</span></span></span></p></td><td style="width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><span style="color:black">data 3b</span></span></span></p></td><td style="width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><span style="color:black">data 3c</span></span></span></p></td></tr><tr><td style="width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><span style="color:black">data 4a</span></span></span></p></td><td style="width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><span style="color:black">data 4b</span></span></span></p></td><td style="width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><span style="color:black">data 4c</span></span></span></p></td></tr></tbody></table><p><br /></p>
<table border="1" cellspacing="0" style="width:2.0in"><tbody><tr><td style="height:15.0pt; background-color:#5b9bd5; width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><strong><span style="color:white">column1</span></strong></span></span></p></td><td style="height:15.0pt; background-color:#5b9bd5; width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><strong><span style="color:white">column2</span></strong></span></span></p></td><td style="height:15.0pt; background-color:#5b9bd5; width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><strong><span style="color:white">column3</span></strong></span></span></p></td></tr><tr><td style="height:15.0pt; width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><span style="color:black">header 1</span></span></span></p></td><td style="height:15.0pt; width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><span style="color:black">header 2</span></span></span></p></td><td style="height:15.0pt; width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><span style="color:black">header 3</span></span></span></p></td></tr><tr><td style="height:15.0pt; width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><span style="color:black">data 1a</span></span></span></p></td><td style="height:15.0pt; width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><span style="color:black">data 1b</span></span></span></p></td><td style="height:15.0pt; width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><span style="color:black">data 1c</span></span></span></p></td></tr><tr><td style="height:15.0pt; width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><span style="color:black">data 2a</span></span></span></p></td><td style="height:15.0pt; width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><span style="color:black">data 2b</span></span></span></p></td><td style="height:15.0pt; width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><span style="color:black">data 2c</span></span></span></p></td></tr><tr><td style="height:15.0pt; width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><span style="color:black">data 3a</span></span></span></p></td><td style="height:15.0pt; width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><span style="color:black">data 3b</span></span></span></p></td><td style="height:15.0pt; width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><span style="color:black">data 3c</span></span></span></p></td></tr><tr><td style="height:15.0pt; width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><span style="color:black">data 4a</span></span></span></p></td><td style="height:15.0pt; width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><span style="color:black">data 4b</span></span></span></p></td><td style="height:15.0pt; width:48.0pt" valign="bottom"><p><span style="line-height:normal"><span style="height:15.0pt"><span style="color:black">data 4c</span></span></span></p></td></tr></tbody></table><p><br /></p>

0 comments on commit 8c3adbb

Please sign in to comment.