Skip to content

Improve Mark formatting #1073

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.

Sign up for GitHub

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

Merged
geriux merged 13 commits into from
Mar 21, 2024
Merged

Improve Mark formatting #1073

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
13c580a
Improve Mark formating by implementing custom Mark plugin and support…
Jan 19, 2024
4f79f24
Fix lint issues
Jan 19, 2024
c48c233
Fix getTextColor in MarkSpan
Jan 22, 2024
9639a10
Update updating existing MarkSpan logic
Jan 22, 2024
9b97880
Fix lint issue
Jan 22, 2024
bdfb20f
MarkSpan - Set color from HTML attributes if they exist
Feb 27, 2024
ffdddf3
InlineFormatter - Prevent picking previous Mark styles if the format …
Feb 29, 2024
bdc719c
Improve setting and resetting Mark formatting styles
Mar 5, 2024
d83e764
Remove unnecessary semicolon
Mar 5, 2024
99b5c9f
Remove markStyleColor check
Mar 7, 2024
299b8ea
Merge branch 'trunk' into fix/mark-style-issues
Mar 18, 2024
17946f2
InlineFormatter - Move markStyleColor declaration
Mar 20, 2024
2f73564
MarkSpan - Rename textColor variable to textColorValue, it also appli…
Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove unnecessary semicolon
  • Loading branch information
Gerardo committed Mar 5, 2024
commit d83e764f5690a3e8f1266e3bb9ef97fda9e0771a
4 changes: 2 additions & 2 deletions aztec/src/main/kotlin/org/wordpress/aztec/formatting/InlineFormatter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ class InlineFormatter(editor: AztecText, val codeStyle: CodeStyle, private val h

// Clear Mark formatting styles
if (!editor.selectedStyles.contains(AztecTextFormat.FORMAT_MARK) && start >= 1 && end > 1 ) {
val previousMarkSpan = editableText.getSpans(start - 1, start, MarkSpan::class.java);
val markSpan = editableText.getSpans(start, end, MarkSpan::class.java);
val previousMarkSpan = editableText.getSpans(start - 1, start, MarkSpan::class.java)
val markSpan = editableText.getSpans(start, end, MarkSpan::class.java)
if (markSpan.isNotEmpty() || (previousMarkSpan.isNotEmpty() && markStyleColor == null)) {
removeInlineCssStyle(start, end)
return
Expand Down