Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: correctly detect italic/bold marker after non-word char (DHIS2-9382) #624

Merged
merged 4 commits into from
Sep 3, 2020

Conversation

edoardo
Copy link
Member

@edoardo edoardo commented Sep 3, 2020

Fixes DHIS2-9382.

Changes proposed in this pull request:

  • fix regexp for correctly detecting the closing italic/bold marker when is preceded by a non-word character.

Fixes the specific case reported in the ticket and any other string where a non-word character is the last character before the closing italic/bold marker.

Just to keep it consistent with the other regex and avoid possible
problems with the code that uses the regex results.
@edoardo edoardo changed the title fix: correctly detect italic marker after non-word char (DHIS2-9382) fix: correctly detect italic/bold marker after non-word char (DHIS2-9382) Sep 3, 2020
Copy link
Contributor

@janhenrikoverland janhenrikoverland left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@edoardo edoardo merged commit cc17ac7 into master Sep 3, 2020
@edoardo edoardo deleted the fix/rich-text-parser branch September 3, 2020 13:15
edoardo added a commit to dhis2/data-visualizer-app that referenced this pull request Sep 25, 2020
Backport.
The fix is in the d2-ui-interpretations component.
See: dhis2/d2-ui#624.
edoardo added a commit to dhis2/data-visualizer-app that referenced this pull request Sep 25, 2020
Backport.
The fix is in the d2-ui-interpretations component.
See: dhis2/d2-ui#624.
dhis2-bot added a commit to dhis2/data-visualizer-app that referenced this pull request Sep 25, 2020
## [34.6.25](v34.6.24...v34.6.25) (2020-09-25)

### Bug Fixes

* rich text parsing issue (DHIS2-9382) ([#1263](#1263)) ([f8b2f88](f8b2f88)), closes [dhis2/d2-ui#624](dhis2/d2-ui#624)
* set a default name if saved vis is untitled ([#1314](#1314)) ([41c264e](41c264e)), closes [#1273](#1273)
dhis2-bot added a commit to dhis2/data-visualizer-app that referenced this pull request Sep 25, 2020
## [33.1.20](v33.1.19...v33.1.20) (2020-09-25)

### Bug Fixes

* rich text parsing issue (DHIS2-9382) v33 ([#1264](#1264)) ([91c76cf](91c76cf)), closes [dhis2/d2-ui#624](dhis2/d2-ui#624)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants