From 55a4b89ab1b80dd2ad5cb559da9f3e9721378c6a Mon Sep 17 00:00:00 2001 From: Mateusz Samsel Date: Wed, 23 Aug 2017 12:12:49 +0200 Subject: [PATCH 01/10] Draft of unit tests --- .../_fixtures/Tickets/423/expected.html | 2 + .../Tickets/423/word2016/chrome.html | 736 ++++++++++++++++++ .../pastefromword/generated/tickets8.js | 39 + 3 files changed, 777 insertions(+) create mode 100644 tests/plugins/pastefromword/generated/_fixtures/Tickets/423/expected.html create mode 100644 tests/plugins/pastefromword/generated/_fixtures/Tickets/423/word2016/chrome.html create mode 100644 tests/plugins/pastefromword/generated/tickets8.js diff --git a/tests/plugins/pastefromword/generated/_fixtures/Tickets/423/expected.html b/tests/plugins/pastefromword/generated/_fixtures/Tickets/423/expected.html new file mode 100644 index 00000000000..2fd0942ff40 --- /dev/null +++ b/tests/plugins/pastefromword/generated/_fixtures/Tickets/423/expected.html @@ -0,0 +1,2 @@ +Paste from Word
Next
+Totally new diff --git a/tests/plugins/pastefromword/generated/_fixtures/Tickets/423/word2016/chrome.html b/tests/plugins/pastefromword/generated/_fixtures/Tickets/423/word2016/chrome.html new file mode 100644 index 00000000000..079325bc85c --- /dev/null +++ b/tests/plugins/pastefromword/generated/_fixtures/Tickets/423/word2016/chrome.html @@ -0,0 +1,736 @@ + + + + + + + + + + + + + + + + + + + +

Paste from word
+Next

+ +

Totally new

+ + + + + diff --git a/tests/plugins/pastefromword/generated/tickets8.js b/tests/plugins/pastefromword/generated/tickets8.js new file mode 100644 index 00000000000..7c8076af841 --- /dev/null +++ b/tests/plugins/pastefromword/generated/tickets8.js @@ -0,0 +1,39 @@ +/* bender-tags: clipboard,pastefromword */ +/* jshint ignore:start */ +/* bender-ckeditor-plugins: pastefromword,ajax,basicstyles,bidi,font,link,toolbar,colorbutton,image */ +/* bender-ckeditor-plugins: list,liststyle,sourcearea,format,justify,table,tableresize,tabletools,indent,indentblock,div,dialog */ +/* jshint ignore:end */ +/* bender-include: _lib/q.js,_helpers/promisePasteEvent.js,_helpers/assertWordFilter.js,_helpers/createTestCase.js */ +/* bender-include: _helpers/createTestSuite.js,_helpers/pfwTools.js */ +/* global createTestSuite */ + +( function() { + 'use strict'; + + var config = { + language: 'en', + removePlugins: 'dialogadvtab,flash,showborders,horizontalrule', + colorButton_normalizeBackground: false, + disallowedContent: 'td{vertical-align}; span; p{margin-*}', + enterMode: CKEDITOR.ENTER_BR + }; + + bender.editor = { + config: config + }; + + bender.test( createTestSuite( { + browsers: [ + 'chrome' + ], + wordVersions: [ + 'word2016' + ], + tests: { + 'Tickets/423': true + }, + + compareRawData: false, + ignoreAll: CKEDITOR.env.ie && CKEDITOR.env.version <= 11 + } ) ); +} )(); From 585c128108a556dbc7e9dfbb1b3505d2bb4adc15 Mon Sep 17 00:00:00 2001 From: Mateusz Samsel Date: Wed, 23 Aug 2017 16:55:28 +0200 Subject: [PATCH 02/10] Update for Unit test. BR mode check. --- .../generated/_fixtures/Tickets/423/word2016/firefox.html | 6 ++++++ .../generated/_fixtures/Tickets/423/word2016/ie11.html | 8 ++++++++ tests/plugins/pastefromword/generated/tickets8.js | 4 +++- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 tests/plugins/pastefromword/generated/_fixtures/Tickets/423/word2016/firefox.html create mode 100644 tests/plugins/pastefromword/generated/_fixtures/Tickets/423/word2016/ie11.html diff --git a/tests/plugins/pastefromword/generated/_fixtures/Tickets/423/word2016/firefox.html b/tests/plugins/pastefromword/generated/_fixtures/Tickets/423/word2016/firefox.html new file mode 100644 index 00000000000..60f48b67ea5 --- /dev/null +++ b/tests/plugins/pastefromword/generated/_fixtures/Tickets/423/word2016/firefox.html @@ -0,0 +1,6 @@ +

Paste from word
+ Next

+ +

Totally new

diff --git a/tests/plugins/pastefromword/generated/_fixtures/Tickets/423/word2016/ie11.html b/tests/plugins/pastefromword/generated/_fixtures/Tickets/423/word2016/ie11.html new file mode 100644 index 00000000000..934b878b51d --- /dev/null +++ b/tests/plugins/pastefromword/generated/_fixtures/Tickets/423/word2016/ie11.html @@ -0,0 +1,8 @@ + + +

Paste from word
 + Next

+ +

Totally new

+ + diff --git a/tests/plugins/pastefromword/generated/tickets8.js b/tests/plugins/pastefromword/generated/tickets8.js index 7c8076af841..e5c1f33c27b 100644 --- a/tests/plugins/pastefromword/generated/tickets8.js +++ b/tests/plugins/pastefromword/generated/tickets8.js @@ -24,7 +24,9 @@ bender.test( createTestSuite( { browsers: [ - 'chrome' + 'chrome', + 'firefox', + 'ie11' ], wordVersions: [ 'word2016' From e3f604cf4f27592c374fc3438ed87daf8bfd1d34 Mon Sep 17 00:00:00 2001 From: Mateusz Samsel Date: Wed, 23 Aug 2017 16:56:19 +0200 Subject: [PATCH 03/10] Fix for pasting in BR mode. --- plugins/pastefromword/filter/default.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plugins/pastefromword/filter/default.js b/plugins/pastefromword/filter/default.js index fdb40e73106..960d51a160a 100644 --- a/plugins/pastefromword/filter/default.js +++ b/plugins/pastefromword/filter/default.js @@ -155,6 +155,14 @@ style[ 'mso-list' ].match( /level/ ) ) { container.attributes[ 'cke-list-level' ] = style[ 'mso-list' ].match( /level(\d+)/ )[1]; } + + if ( editor.config.enterMode == CKEDITOR.ENTER_BR ) { + // We suffer from attribute/style lost in this situation. + delete element.name; + element.add( new CKEDITOR.htmlParser.element( 'br' ) ); + } else { + // elementMigrateFilter( config[ 'format_' + ( config.enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' ) ] )( element ); + } } Style.createStyleStack( element, filter, editor ); From 30720e897911ed7bed2e87a37d26f984c294fb7e Mon Sep 17 00:00:00 2001 From: Mateusz Samsel Date: Thu, 24 Aug 2017 12:10:46 +0200 Subject: [PATCH 04/10] Rework unit tests --- .../generated/_fixtures/Enter_BR/Enter_BR.docx | Bin 0 -> 11502 bytes .../{Tickets/423 => Enter_BR}/expected.html | 0 .../423 => Enter_BR}/word2016/chrome.html | 0 .../423 => Enter_BR}/word2016/firefox.html | 6 ++---- .../423 => Enter_BR}/word2016/ie11.html | 0 .../_fixtures/Enter_BR/word2016/ie8.html | 2 ++ .../generated/{tickets8.js => enter_br.js} | 16 +++++++--------- 7 files changed, 11 insertions(+), 13 deletions(-) create mode 100644 tests/plugins/pastefromword/generated/_fixtures/Enter_BR/Enter_BR.docx rename tests/plugins/pastefromword/generated/_fixtures/{Tickets/423 => Enter_BR}/expected.html (100%) rename tests/plugins/pastefromword/generated/_fixtures/{Tickets/423 => Enter_BR}/word2016/chrome.html (100%) rename tests/plugins/pastefromword/generated/_fixtures/{Tickets/423 => Enter_BR}/word2016/firefox.html (56%) rename tests/plugins/pastefromword/generated/_fixtures/{Tickets/423 => Enter_BR}/word2016/ie11.html (100%) create mode 100644 tests/plugins/pastefromword/generated/_fixtures/Enter_BR/word2016/ie8.html rename tests/plugins/pastefromword/generated/{tickets8.js => enter_br.js} (51%) diff --git a/tests/plugins/pastefromword/generated/_fixtures/Enter_BR/Enter_BR.docx b/tests/plugins/pastefromword/generated/_fixtures/Enter_BR/Enter_BR.docx new file mode 100644 index 0000000000000000000000000000000000000000..f92c307e167417b0bfd38bfe1abb48115299bd3b GIT binary patch literal 11502 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 from word
+

Paste from word
Next

-

Totally new

+

Totally new

diff --git a/tests/plugins/pastefromword/generated/_fixtures/Tickets/423/word2016/ie11.html b/tests/plugins/pastefromword/generated/_fixtures/Enter_BR/word2016/ie11.html similarity index 100% rename from tests/plugins/pastefromword/generated/_fixtures/Tickets/423/word2016/ie11.html rename to tests/plugins/pastefromword/generated/_fixtures/Enter_BR/word2016/ie11.html diff --git a/tests/plugins/pastefromword/generated/_fixtures/Enter_BR/word2016/ie8.html b/tests/plugins/pastefromword/generated/_fixtures/Enter_BR/word2016/ie8.html new file mode 100644 index 00000000000..2f30e500c45 --- /dev/null +++ b/tests/plugins/pastefromword/generated/_fixtures/Enter_BR/word2016/ie8.html @@ -0,0 +1,2 @@ +

Paste from word
Next

+

Totally new

diff --git a/tests/plugins/pastefromword/generated/tickets8.js b/tests/plugins/pastefromword/generated/enter_br.js similarity index 51% rename from tests/plugins/pastefromword/generated/tickets8.js rename to tests/plugins/pastefromword/generated/enter_br.js index e5c1f33c27b..6d77e84bb68 100644 --- a/tests/plugins/pastefromword/generated/tickets8.js +++ b/tests/plugins/pastefromword/generated/enter_br.js @@ -1,10 +1,9 @@ /* bender-tags: clipboard,pastefromword */ /* jshint ignore:start */ -/* bender-ckeditor-plugins: pastefromword,ajax,basicstyles,bidi,font,link,toolbar,colorbutton,image */ -/* bender-ckeditor-plugins: list,liststyle,sourcearea,format,justify,table,tableresize,tabletools,indent,indentblock,div,dialog */ +/* bender-ckeditor-plugins: pastefromword,ajax,basicstyles,toolbar */ /* jshint ignore:end */ /* bender-include: _lib/q.js,_helpers/promisePasteEvent.js,_helpers/assertWordFilter.js,_helpers/createTestCase.js */ -/* bender-include: _helpers/createTestSuite.js,_helpers/pfwTools.js */ +/* bender-include: _helpers/createTestSuite.js */ /* global createTestSuite */ ( function() { @@ -12,9 +11,8 @@ var config = { language: 'en', - removePlugins: 'dialogadvtab,flash,showborders,horizontalrule', colorButton_normalizeBackground: false, - disallowedContent: 'td{vertical-align}; span; p{margin-*}', + allowedContent: 'p strong em', enterMode: CKEDITOR.ENTER_BR }; @@ -26,16 +24,16 @@ browsers: [ 'chrome', 'firefox', - 'ie11' + 'ie11', + 'ie8' ], wordVersions: [ 'word2016' ], tests: { - 'Tickets/423': true + 'Enter_BR': true }, - compareRawData: false, - ignoreAll: CKEDITOR.env.ie && CKEDITOR.env.version <= 11 + compareRawData: false } ) ); } )(); From 53312b8779ded62e674710db7fa379337b2ffdb5 Mon Sep 17 00:00:00 2001 From: Mateusz Samsel Date: Thu, 24 Aug 2017 12:12:11 +0200 Subject: [PATCH 05/10] Fix improvement --- plugins/pastefromword/filter/default.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/pastefromword/filter/default.js b/plugins/pastefromword/filter/default.js index 960d51a160a..ae326b8c36f 100644 --- a/plugins/pastefromword/filter/default.js +++ b/plugins/pastefromword/filter/default.js @@ -156,13 +156,13 @@ container.attributes[ 'cke-list-level' ] = style[ 'mso-list' ].match( /level(\d+)/ )[1]; } + // Adapt paragraph formatting to editor's convention according to enter-mode (#423). if ( editor.config.enterMode == CKEDITOR.ENTER_BR ) { // We suffer from attribute/style lost in this situation. delete element.name; element.add( new CKEDITOR.htmlParser.element( 'br' ) ); - } else { - // elementMigrateFilter( config[ 'format_' + ( config.enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' ) ] )( element ); } + } Style.createStyleStack( element, filter, editor ); From 019a993e1e00396d13276c4f38f8ad55672cb2b7 Mon Sep 17 00:00:00 2001 From: Mateusz Samsel Date: Thu, 24 Aug 2017 12:48:17 +0200 Subject: [PATCH 06/10] Manual tests --- tests/plugins/pastefromword/manual/enterbr.html | 8 ++++++++ tests/plugins/pastefromword/manual/enterbr.md | 14 ++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 tests/plugins/pastefromword/manual/enterbr.html create mode 100644 tests/plugins/pastefromword/manual/enterbr.md diff --git a/tests/plugins/pastefromword/manual/enterbr.html b/tests/plugins/pastefromword/manual/enterbr.html new file mode 100644 index 00000000000..a3e1790c506 --- /dev/null +++ b/tests/plugins/pastefromword/manual/enterbr.html @@ -0,0 +1,8 @@ + + diff --git a/tests/plugins/pastefromword/manual/enterbr.md b/tests/plugins/pastefromword/manual/enterbr.md new file mode 100644 index 00000000000..3628b045ab7 --- /dev/null +++ b/tests/plugins/pastefromword/manual/enterbr.md @@ -0,0 +1,14 @@ +@bender-tags: bug, 4.7.3, word +@bender-ui: collapsed +@bender-ckeditor-plugins: pastefromword,toolbar,basicstyles,wysiwygarea,sourcearea + +---- +1. Open [docx file](https://github.com/ckeditor/ckeditor-dev/blob/master/tests/plugins/pastefromword/generated/_fixtures/Enter_BR/Enter_BR.docx) in Microsft Word. +1. Copy text from file and paste it to editor. +1. Check Source in editor. + +**Expected:** There is no `

` tags in source. Every pparagraph is replaced wit `
`. + +**Unexpected:** There are `

` tag after paste. + + From 822b2468074d9011690bbfc50262886bc0357681 Mon Sep 17 00:00:00 2001 From: Mateusz Samsel Date: Thu, 24 Aug 2017 15:34:08 +0200 Subject: [PATCH 07/10] Fixes after review. --- .../_fixtures/Enter_BR/word2016/firefox.html | 739 +++++++++++++++++- tests/plugins/pastefromword/manual/enterbr.md | 4 +- 2 files changed, 738 insertions(+), 5 deletions(-) diff --git a/tests/plugins/pastefromword/generated/_fixtures/Enter_BR/word2016/firefox.html b/tests/plugins/pastefromword/generated/_fixtures/Enter_BR/word2016/firefox.html index b027f982d53..c95c785e76b 100644 --- a/tests/plugins/pastefromword/generated/_fixtures/Enter_BR/word2016/firefox.html +++ b/tests/plugins/pastefromword/generated/_fixtures/Enter_BR/word2016/firefox.html @@ -1,4 +1,737 @@ -

Paste from word
- Next

-

Totally new

+ + + + + + + + + + + + + + + + + + + +

Paste from word
+Next

+ +

Totally new

+ + + + + diff --git a/tests/plugins/pastefromword/manual/enterbr.md b/tests/plugins/pastefromword/manual/enterbr.md index 3628b045ab7..a57fe07ff97 100644 --- a/tests/plugins/pastefromword/manual/enterbr.md +++ b/tests/plugins/pastefromword/manual/enterbr.md @@ -3,11 +3,11 @@ @bender-ckeditor-plugins: pastefromword,toolbar,basicstyles,wysiwygarea,sourcearea ---- -1. Open [docx file](https://github.com/ckeditor/ckeditor-dev/blob/master/tests/plugins/pastefromword/generated/_fixtures/Enter_BR/Enter_BR.docx) in Microsft Word. +1. Open [docx file](../generated/_fixtures/Enter_BR/Enter_BR.docx) in Microsft Word. 1. Copy text from file and paste it to editor. 1. Check Source in editor. -**Expected:** There is no `

` tags in source. Every pparagraph is replaced wit `
`. +**Expected:** There is no `

` tags in source. Every paragraph is replaced with `
`. **Unexpected:** There are `

` tag after paste. From cdd82c698c04a95ba10372241f552152dace49df Mon Sep 17 00:00:00 2001 From: Mateusz Samsel Date: Thu, 24 Aug 2017 16:32:40 +0200 Subject: [PATCH 08/10] Fix for manual test --- tests/plugins/pastefromword/manual/enterbr.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/plugins/pastefromword/manual/enterbr.html b/tests/plugins/pastefromword/manual/enterbr.html index a3e1790c506..ce93b01db6e 100644 --- a/tests/plugins/pastefromword/manual/enterbr.html +++ b/tests/plugins/pastefromword/manual/enterbr.html @@ -3,6 +3,7 @@ From 71fd4c28dc6b8c557ddf194ea18a713bad521f86 Mon Sep 17 00:00:00 2001 From: Tomasz Jakut Date: Thu, 24 Aug 2017 17:17:49 +0200 Subject: [PATCH 09/10] Add enterkey plugin to manual test. --- tests/plugins/pastefromword/manual/enterbr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/plugins/pastefromword/manual/enterbr.md b/tests/plugins/pastefromword/manual/enterbr.md index a57fe07ff97..26f267e0efc 100644 --- a/tests/plugins/pastefromword/manual/enterbr.md +++ b/tests/plugins/pastefromword/manual/enterbr.md @@ -1,6 +1,6 @@ @bender-tags: bug, 4.7.3, word @bender-ui: collapsed -@bender-ckeditor-plugins: pastefromword,toolbar,basicstyles,wysiwygarea,sourcearea +@bender-ckeditor-plugins: pastefromword,toolbar,basicstyles,enterkey,wysiwygarea,sourcearea ---- 1. Open [docx file](../generated/_fixtures/Enter_BR/Enter_BR.docx) in Microsft Word. From ce334259118a41479aab55a3c033607d129c558b Mon Sep 17 00:00:00 2001 From: Tomasz Jakut Date: Thu, 24 Aug 2017 17:25:42 +0200 Subject: [PATCH 10/10] Update changelog [ci skip]. --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 1b352986abb..c98b0ad2198 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -12,6 +12,7 @@ Fixed Issues: * [#554](https://github.com/ckeditor/ckeditor-dev/issues/554): Fixed: [`change`](https://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-change) event not fired when typing the first character after pasting into the editor. Thanks to [Daniel Miller](https://github.com/millerdev)! * [#566](https://github.com/ckeditor/ckeditor-dev/issues/566): Fixed: The CSS border shorthand property with zero width (`border: 0px solid #000;`) no longer causes table to have border attribute set to 1. * [#779](https://github.com/ckeditor/ckeditor-dev/issues/779): Fixed: [Remove Format](https://ckeditor.com/addon/removeformat) plugin removes elements with language definition inserted by [Language](https://ckeditor.com/addon/language) plugin. +* [#423](https://github.com/ckeditor/ckeditor-dev/issues/423): Fixed: [Paste from Word](https://ckeditor.com/addon/pastefromword) plugin pastes paragraphs into the editor even if [`CKEDITOR.config.enterMode`](https://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-enterMode) is set to `CKEDITOR.ENTER_BR`. ## CKEditor 4.7.2