Properly transform text in blocks with inline element. #219

jodator · 2019-09-11T13:11:10Z

Suggested merge commit message (convention)

Fix: Autoformat transformations in blocks containing inline elements. See ckeditor/ckeditor5#1955.

Additional information

This is a sub-pr that fixes the same bug as described in Shift+Enter causes weird issues with code element ckeditor5#1955 and fixed in: Properly transform text in blocks with inline element. ckeditor5-autoformat#76.

In the previous check we didn't account that <softBreak> or other inline elements were excluded from match. Also the matched text was trimmed to the last inline node.

src/textwatcher.js

src/utils/gettext.js

scofalik

Also, please add a simple example to getLastTextLine() and update docs in textwatcher.js (you missed that).

src/utils/getlasttextline.js

Co-Authored-By: Szymon Cofalik <s.cofalik@cksource.com>

jodator added 2 commits September 11, 2019 14:12

Use range from text watcher event to properly alter matched text.

e916d87

In the previous check we didn't account that <softBreak> or other inline elements were excluded from match. Also the matched text was trimmed to the last inline node.

Introduce getText() protected util.

87fbd04

jodator added the pr:sub label Sep 11, 2019

jodator requested a review from scofalik September 11, 2019 13:11

jodator mentioned this pull request Sep 11, 2019

Properly transform text in blocks with inline element. ckeditor/ckeditor5-autoformat#76

Merged

Fix code style in tests.

157c36f

scofalik suggested changes Sep 11, 2019

View reviewed changes

src/textwatcher.js Outdated Show resolved Hide resolved

src/utils/gettext.js Outdated Show resolved Hide resolved

src/utils/gettext.js Outdated Show resolved Hide resolved

scofalik added the status:review- label Sep 11, 2019

scofalik self-assigned this Sep 12, 2019

jodator added 2 commits September 12, 2019 11:54

Rename getText() to getLastTextLine().

1baf003

Fix docs in getLastTextLine util.

8acf838

jodator removed the status:review- label Sep 12, 2019

jodator requested a review from scofalik September 12, 2019 09:56

scofalik suggested changes Sep 12, 2019

View reviewed changes

scofalik added the status:review- label Sep 12, 2019

jodator and others added 8 commits September 12, 2019 15:49

Update src/utils/getlasttextline.js

44f6162

Co-Authored-By: Szymon Cofalik <s.cofalik@cksource.com>

Update src/utils/getlasttextline.js

463f452

Co-Authored-By: Szymon Cofalik <s.cofalik@cksource.com>

Update src/utils/getlasttextline.js

a5aff97

Co-Authored-By: Szymon Cofalik <s.cofalik@cksource.com>

Update src/utils/getlasttextline.js

acdc17d

Co-Authored-By: Szymon Cofalik <s.cofalik@cksource.com>

Update src/utils/getlasttextline.js

ec36e8e

Co-Authored-By: Szymon Cofalik <s.cofalik@cksource.com>

Fix docs length.

dd5c517

Remove redundant method.

7c19294

Add code sample to getLastTextLine() function.

ec56fb8

jodator removed the status:review- label Sep 12, 2019

Fix docs of the getLastTextLine().

b563ea8

jodator requested a review from scofalik September 12, 2019 14:09

Docs: Fixed example.

f5e3f87

scofalik merged commit 58abd23 into master Sep 12, 2019

scofalik deleted the t/ckeditor5/1955 branch September 12, 2019 14:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Properly transform text in blocks with inline element. #219

Properly transform text in blocks with inline element. #219

jodator commented Sep 11, 2019

scofalik left a comment

Properly transform text in blocks with inline element. #219

Properly transform text in blocks with inline element. #219

Conversation

jodator commented Sep 11, 2019

Suggested merge commit message (convention)

Additional information

scofalik left a comment

Choose a reason for hiding this comment