Paste from word now respect enter_br mode #826
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| <strong><em>Paste from Word<br />Next</em></strong><br /> | ||
| <strong><em>Totally new</em></strong> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| <p class=MsoNormal><b style='mso-bidi-font-weight:normal'><i style='mso-bidi-font-style:normal'>Paste from word<br> | ||
| Next<o:p></o:p></i></b></p> | ||
|
|
||
| <p class=MsoNormal><b style='mso-bidi-font-weight:normal'><i style='mso-bidi-font-style:normal'>Totally new<o:p></o:p></i></b></p> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| <font color="#000000" face="Times New Roman" size="3"> | ||
|
|
||
| </font><p style="margin: 0in 0in 8pt;"><b style="mso-bidi-font-weight: normal;"><i style="mso-bidi-font-style: normal;"><font face="Calibri"><font color="#000000" size="3">Paste from word<br></font><font color="#000000" size="3"> | ||
| Next</font></font></i></b></p><font color="#000000" face="Times New Roman" size="3"> | ||
|
|
||
| </font><p style="margin: 0in 0in 8pt;"><b style="mso-bidi-font-weight: normal;"><i style="mso-bidi-font-style: normal;"><font color="#000000" face="Calibri" size="3">Totally new</font></i></b></p><font color="#000000" face="Times New Roman" size="3"> | ||
|
|
||
| </font> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| <P style="MARGIN: 0in 0in 8pt" class=MsoNormal><B style="mso-bidi-font-weight: normal"><I style="mso-bidi-font-style: normal"><FONT size=3><FONT color=#000000>Paste from word<BR>Next<o:p></o:p></FONT></FONT></I></B></P> | ||
| <P style="MARGIN: 0in 0in 8pt" class=MsoNormal><B style="mso-bidi-font-weight: normal"><I style="mso-bidi-font-style: normal"><FONT size=3><FONT color=#000000>Totally new<o:p></o:p></FONT></FONT></I></B></P> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /* bender-tags: clipboard,pastefromword */ | ||
| /* jshint ignore:start */ | ||
| /* 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 */ | ||
| /* global createTestSuite */ | ||
|
|
||
| ( function() { | ||
| 'use strict'; | ||
|
|
||
| var config = { | ||
| language: 'en', | ||
| colorButton_normalizeBackground: false, | ||
| allowedContent: 'p strong em', | ||
| enterMode: CKEDITOR.ENTER_BR | ||
| }; | ||
|
|
||
| bender.editor = { | ||
| config: config | ||
| }; | ||
|
|
||
| bender.test( createTestSuite( { | ||
| browsers: [ | ||
| 'chrome', | ||
| 'firefox', | ||
| 'ie11', | ||
| 'ie8' | ||
| ], | ||
| wordVersions: [ | ||
| 'word2016' | ||
| ], | ||
| tests: { | ||
| 'Enter_BR': true | ||
| }, | ||
|
|
||
| compareRawData: false | ||
| } ) ); | ||
| } )(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| <textarea cols="80" id="editor1" name="editor1" rows="10"> | ||
| Hello World | ||
| </textarea> | ||
| <script> | ||
| var editor = CKEDITOR.replace( 'editor1', { | ||
| enterMode: CKEDITOR.ENTER_BR | ||
| } ); | ||
| </script> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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. | ||
|
There was a problem hiding this comment. It's better to use relative path as this one is not working currently. |
||
| 1. Copy text from file and paste it to editor. | ||
| 1. Check Source in editor. | ||
|
|
||
| **Expected:** There is no `<p>` tags in source. Every pparagraph is replaced wit `<br />`. | ||
|
|
||
|
|
||
| **Unexpected:** There are `<p>` tag after paste. | ||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure if it's correct fixture for Firefox. It should like like the one from Chrome, containing all HTML as Firefox also supports fetching HTML from native
dataTransfer.