From ccea86f984a4bcaa75b21db3851556ce17affc8a Mon Sep 17 00:00:00 2001 From: Mateusz Samsel Date: Tue, 12 Sep 2017 14:17:34 +0200 Subject: [PATCH 1/6] Unit tests. --- .../Unordered_list_special_char_bullet.docx | Bin 0 -> 13355 bytes .../expected.html | 27 + .../word2013/chrome.html | 916 ++++++++++++++++++ .../word2013/expected_ie11.html | 33 + .../word2013/firefox.html | 916 ++++++++++++++++++ .../word2013/ie11.html | 10 + .../pastefromword/generated/generic.js | 1 + 7 files changed, 1903 insertions(+) create mode 100644 tests/plugins/pastefromword/generated/_fixtures/Unordered_list_special_char_bullet/Unordered_list_special_char_bullet.docx create mode 100644 tests/plugins/pastefromword/generated/_fixtures/Unordered_list_special_char_bullet/expected.html create mode 100644 tests/plugins/pastefromword/generated/_fixtures/Unordered_list_special_char_bullet/word2013/chrome.html create mode 100644 tests/plugins/pastefromword/generated/_fixtures/Unordered_list_special_char_bullet/word2013/expected_ie11.html create mode 100644 tests/plugins/pastefromword/generated/_fixtures/Unordered_list_special_char_bullet/word2013/firefox.html create mode 100644 tests/plugins/pastefromword/generated/_fixtures/Unordered_list_special_char_bullet/word2013/ie11.html diff --git a/tests/plugins/pastefromword/generated/_fixtures/Unordered_list_special_char_bullet/Unordered_list_special_char_bullet.docx b/tests/plugins/pastefromword/generated/_fixtures/Unordered_list_special_char_bullet/Unordered_list_special_char_bullet.docx new file mode 100644 index 0000000000000000000000000000000000000000..6605e78bc279ae58901848513ed00d9974b0e0e3 GIT binary patch literal 13355 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 PBIpGM(ohVRpLhQU9)}vt literal 0 HcmV?d00001 diff --git a/tests/plugins/pastefromword/generated/_fixtures/Unordered_list_special_char_bullet/expected.html b/tests/plugins/pastefromword/generated/_fixtures/Unordered_list_special_char_bullet/expected.html new file mode 100644 index 00000000000..d34ecdb1e4e --- /dev/null +++ b/tests/plugins/pastefromword/generated/_fixtures/Unordered_list_special_char_bullet/expected.html @@ -0,0 +1,27 @@ +
    +
  • + + + one + + +
      +
    • + + + two + + +
        +
      • + + + three + + +
        • +
      +
      • +
    +
    • +
diff --git a/tests/plugins/pastefromword/generated/_fixtures/Unordered_list_special_char_bullet/word2013/chrome.html b/tests/plugins/pastefromword/generated/_fixtures/Unordered_list_special_char_bullet/word2013/chrome.html new file mode 100644 index 00000000000..a296a2aec58 --- /dev/null +++ b/tests/plugins/pastefromword/generated/_fixtures/Unordered_list_special_char_bullet/word2013/chrome.html @@ -0,0 +1,916 @@ + + + + + + + + + + + + + + + + + + + +

*      +One

+ +

+     +Two

+ +

?      +Three

+ + + + + diff --git a/tests/plugins/pastefromword/generated/_fixtures/Unordered_list_special_char_bullet/word2013/expected_ie11.html b/tests/plugins/pastefromword/generated/_fixtures/Unordered_list_special_char_bullet/word2013/expected_ie11.html new file mode 100644 index 00000000000..f489790ae45 --- /dev/null +++ b/tests/plugins/pastefromword/generated/_fixtures/Unordered_list_special_char_bullet/word2013/expected_ie11.html @@ -0,0 +1,33 @@ +
    +
  • + + one + +
      +
    • + + + + + two + + + + +
        +
      • + + + + + three + + + + +
        • +
      +
      • +
    +
    • +
diff --git a/tests/plugins/pastefromword/generated/_fixtures/Unordered_list_special_char_bullet/word2013/firefox.html b/tests/plugins/pastefromword/generated/_fixtures/Unordered_list_special_char_bullet/word2013/firefox.html new file mode 100644 index 00000000000..a296a2aec58 --- /dev/null +++ b/tests/plugins/pastefromword/generated/_fixtures/Unordered_list_special_char_bullet/word2013/firefox.html @@ -0,0 +1,916 @@ + + + + + + + + + + + + + + + + + + + +

*      +One

+ +

+     +Two

+ +

?      +Three

+ + + + + diff --git a/tests/plugins/pastefromword/generated/_fixtures/Unordered_list_special_char_bullet/word2013/ie11.html b/tests/plugins/pastefromword/generated/_fixtures/Unordered_list_special_char_bullet/word2013/ie11.html new file mode 100644 index 00000000000..0950599927a --- /dev/null +++ b/tests/plugins/pastefromword/generated/_fixtures/Unordered_list_special_char_bullet/word2013/ie11.html @@ -0,0 +1,10 @@ + + + +

  • One

    • Two

      • Three

+ + + + + + diff --git a/tests/plugins/pastefromword/generated/generic.js b/tests/plugins/pastefromword/generated/generic.js index a5996dca024..a60fc0d000c 100644 --- a/tests/plugins/pastefromword/generated/generic.js +++ b/tests/plugins/pastefromword/generated/generic.js @@ -46,6 +46,7 @@ 'Text_alignment': true, 'Underline': true, 'Unordered_list': true, + 'Unordered_list_special_char_bullet': true, 'Table_alignment': true, 'Table_vertical_alignment': true }, From 74f48f3cfdb32483608c6bc2f62002f37e141abb Mon Sep 17 00:00:00 2001 From: Mateusz Samsel Date: Wed, 13 Sep 2017 11:17:34 +0200 Subject: [PATCH 2/6] Manual test. --- .../manual/unorderedlistspecialchar.html | 4 ++++ .../manual/unorderedlistspecialchar.md | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 tests/plugins/pastefromword/manual/unorderedlistspecialchar.html create mode 100644 tests/plugins/pastefromword/manual/unorderedlistspecialchar.md diff --git a/tests/plugins/pastefromword/manual/unorderedlistspecialchar.html b/tests/plugins/pastefromword/manual/unorderedlistspecialchar.html new file mode 100644 index 00000000000..cde2278b009 --- /dev/null +++ b/tests/plugins/pastefromword/manual/unorderedlistspecialchar.html @@ -0,0 +1,4 @@ + + diff --git a/tests/plugins/pastefromword/manual/unorderedlistspecialchar.md b/tests/plugins/pastefromword/manual/unorderedlistspecialchar.md new file mode 100644 index 00000000000..9d9614ebbd6 --- /dev/null +++ b/tests/plugins/pastefromword/manual/unorderedlistspecialchar.md @@ -0,0 +1,16 @@ +@bender-tags: bug, 4.8.0, 877, pastefromword +@bender-ui: collapsed +@bender-ckeditor-plugins: wysiwygarea, toolbar, undo, pastefromword, sourcearea, list + +---- +1. Open browser console. +1. Open [file](../generated/_fixtures/Unordered_list_special_char_bullet/Unordered_list_special_char_bullet.docx) in Word. +1. Select whole content in Word and copy it to clipboard. +1. Focus CKEditor. +1. Paste word content to editor. + +### Expected +List is pasted to the editor. + +### Unexpected +Error appears in console and list is not pasted to the editor. From a757dbe16b14108339390a94d72d8abfad877d3d Mon Sep 17 00:00:00 2001 From: Mateusz Samsel Date: Tue, 12 Sep 2017 13:53:49 +0200 Subject: [PATCH 3/6] Fix problem with astriks symbol as bulleted list in paste from word. --- plugins/pastefromword/filter/default.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/pastefromword/filter/default.js b/plugins/pastefromword/filter/default.js index 0098728ff7e..e00384a7891 100644 --- a/plugins/pastefromword/filter/default.js +++ b/plugins/pastefromword/filter/default.js @@ -1085,7 +1085,8 @@ symbol = element.attributes[ 'cke-symbol' ]; element.forEach( function( node ) { - if ( !removed && node.value.match( symbol.replace( ')', '\\)' ).replace( '(', '' ) ) ) { + // Changing `match` -> `indexOf`, symbol is String not RegExp (#877). + if ( !removed && node.value.indexOf( symbol ) > -1 ) { node.value = node.value.replace( symbol, '' ); From 0efa05dc15a6c5f5f5344b53eb630815827d4f1c Mon Sep 17 00:00:00 2001 From: Mateusz Samsel Date: Wed, 4 Oct 2017 13:14:22 +0200 Subject: [PATCH 4/6] Review: ignore tests on edge, reword comment, fix manual test description. --- plugins/pastefromword/filter/default.js | 2 +- tests/plugins/pastefromword/generated/generic.js | 4 +++- .../plugins/pastefromword/manual/unorderedlistspecialchar.md | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/pastefromword/filter/default.js b/plugins/pastefromword/filter/default.js index e00384a7891..2f667145bb4 100644 --- a/plugins/pastefromword/filter/default.js +++ b/plugins/pastefromword/filter/default.js @@ -1085,7 +1085,7 @@ symbol = element.attributes[ 'cke-symbol' ]; element.forEach( function( node ) { - // Changing `match` -> `indexOf`, symbol is String not RegExp (#877). + // Since symbol may contains special characters we use simple indexOf instead of RegExp which is sufficient (#877). if ( !removed && node.value.indexOf( symbol ) > -1 ) { node.value = node.value.replace( symbol, '' ); diff --git a/tests/plugins/pastefromword/generated/generic.js b/tests/plugins/pastefromword/generated/generic.js index a60fc0d000c..376c97d2907 100644 --- a/tests/plugins/pastefromword/generated/generic.js +++ b/tests/plugins/pastefromword/generated/generic.js @@ -53,7 +53,9 @@ testData: { _should: { ignore: { - 'test Object word2013 datatransfer': CKEDITOR.env.edge + 'test Object word2013 datatransfer': CKEDITOR.env.edge, + 'test Unordered_list_special_char_bullet word2013 chrome': CKEDITOR.env.edge, + 'test Unordered_list_special_char_bullet word2013 firefox': CKEDITOR.env.edge } } }, diff --git a/tests/plugins/pastefromword/manual/unorderedlistspecialchar.md b/tests/plugins/pastefromword/manual/unorderedlistspecialchar.md index 9d9614ebbd6..8f15f11b673 100644 --- a/tests/plugins/pastefromword/manual/unorderedlistspecialchar.md +++ b/tests/plugins/pastefromword/manual/unorderedlistspecialchar.md @@ -4,7 +4,7 @@ ---- 1. Open browser console. -1. Open [file](../generated/_fixtures/Unordered_list_special_char_bullet/Unordered_list_special_char_bullet.docx) in Word. +1. Open [Unordered_list_special_char_bullet.docx](../generated/_fixtures/Unordered_list_special_char_bullet/Unordered_list_special_char_bullet.docx) in Word. 1. Select whole content in Word and copy it to clipboard. 1. Focus CKEditor. 1. Paste word content to editor. From 36ec52ef45a9ce2a6118740478182dabdcfa532d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Krzto=C5=84?= Date: Fri, 6 Oct 2017 11:27:58 +0200 Subject: [PATCH 5/6] Rewording. --- plugins/pastefromword/filter/default.js | 2 +- .../pastefromword/manual/unorderedlistspecialchar.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/pastefromword/filter/default.js b/plugins/pastefromword/filter/default.js index 2f667145bb4..05572c596c0 100644 --- a/plugins/pastefromword/filter/default.js +++ b/plugins/pastefromword/filter/default.js @@ -1085,7 +1085,7 @@ symbol = element.attributes[ 'cke-symbol' ]; element.forEach( function( node ) { - // Since symbol may contains special characters we use simple indexOf instead of RegExp which is sufficient (#877). + // Since symbol may contains special characters we use `indexOf` (instead of RegExp) which is sufficient (#877). if ( !removed && node.value.indexOf( symbol ) > -1 ) { node.value = node.value.replace( symbol, '' ); diff --git a/tests/plugins/pastefromword/manual/unorderedlistspecialchar.md b/tests/plugins/pastefromword/manual/unorderedlistspecialchar.md index 8f15f11b673..91dc916ee8d 100644 --- a/tests/plugins/pastefromword/manual/unorderedlistspecialchar.md +++ b/tests/plugins/pastefromword/manual/unorderedlistspecialchar.md @@ -5,12 +5,12 @@ ---- 1. Open browser console. 1. Open [Unordered_list_special_char_bullet.docx](../generated/_fixtures/Unordered_list_special_char_bullet/Unordered_list_special_char_bullet.docx) in Word. -1. Select whole content in Word and copy it to clipboard. +1. Select and copy whole content from Word. 1. Focus CKEditor. -1. Paste word content to editor. +1. Paste copied Word content into the editor. ### Expected List is pasted to the editor. ### Unexpected -Error appears in console and list is not pasted to the editor. +Error appears in browser console and list is not pasted to the editor. From dfea9ba82ab69c7dfe31c627e46c9cd9f5854448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Krzto=C5=84?= Date: Fri, 6 Oct 2017 11:45:55 +0200 Subject: [PATCH 6/6] Changelog entry. [skip ci] --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 53a3ec5685a..42729e416ce 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -21,6 +21,7 @@ Fixed Issues: * [#862](https://github.com/ckeditor/ckeditor-dev/issues/862): Fixed: "Object Styles" group in [Styles Combo](https://ckeditor.com/addon/stylescombo) plugin is visible only if whole element is selected. * [#994](https://github.com/ckeditor/ckeditor-dev/pull/994): Fixed: Typo in [`CKEDITOR.focusManager.focus`](https://docs.ckeditor.com/#!/api/CKEDITOR.focusManager-method-focus) API documentation. Thanks to [benjy](https://github.com/benjy)! * [#1014](https://github.com/ckeditor/ckeditor-dev/issues/1014): Fixed: [Table Tools](https://ckeditor.com/addon/tabletools) cell properties dialog is now [ACF](http://docs.ckeditor.com/#!/guide/dev_acf) aware - it not possible to change cell width/height if corresponding styles are disabled. +* [#877](https://github.com/ckeditor/ckeditor-dev/issues/877): Fixed: Lists with custom bullets with exotic characters crashes editor when [pasted from Word](http://ckeditor.com/addon/pastefromword). Other Changes: