Skip to content

Commit 93f0a5a

Browse files
Merge pull request #1292 from wordpress-mobile/release/1.19.2
Release 1.19.2
2 parents be24064 + 23e4090 commit 93f0a5a

File tree

5 files changed

+9
-5
lines changed

5 files changed

+9
-5
lines changed

Aztec/Classes/TextKit/LayoutManager.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,8 +369,7 @@ extension LayoutManager {
369369
let underlinedString = textStorage.attributedSubstring(from: glyphRange).string
370370
var updatedGlyphRange = glyphRange
371371
if glyphRange.endLocation == lineGlyphRange.endLocation,
372-
underlinedString.contains(String.init(.nonBreakingSpace)),
373-
underlinedString.hasSuffix(String.init(.paragraphSeparator))
372+
underlinedString.hasSuffix(String.init(.paragraphSeparator)) || underlinedString.hasSuffix(String.init(.lineSeparator)) || underlinedString.hasSuffix(String.init(.carriageReturn)) || underlinedString.hasSuffix(String.init(.lineFeed))
374373
{
375374
updatedGlyphRange = NSRange(location: glyphRange.location, length: glyphRange.length - 1)
376375
}

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
1.19.2
2+
-------
3+
* Fix drawing of underlines when they include newlines.
4+
15
1.19.1
26
-------
37
* Fix a bug where collapse of whitespaces was happening for empty HTML nodes.

Example/Example/SampleContent/underline.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<p><u>Hello&nbsp;world</u></p>
1+
<p><u>No NBSP</u></p>
2+
<p><u>With&nbsp;NBSP</u></p>
23
<p><span style="text-decoration: underline;">Alternative&nbsp;underline&nbsp;text</span></p>
34
<p>Before link <a href="www.wordpress.com">Link&nbsp;to&nbsp;WordPress</a></p>
45
<p>Before link <a href="www.jetpack.com">Link&nbsp;to&nbsp;Jetpack</a> After link</p>

WordPress-Aztec-iOS.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
Pod::Spec.new do |s|
1010
s.name = 'WordPress-Aztec-iOS'
11-
s.version = '1.19.1'
11+
s.version = '1.19.2'
1212
s.summary = 'The native HTML Editor.'
1313

1414
# This description is used to generate tags and improve search results.

WordPress-Editor-iOS.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
Pod::Spec.new do |s|
1010
s.name = 'WordPress-Editor-iOS'
11-
s.version = '1.19.1'
11+
s.version = '1.19.2'
1212
s.summary = 'The WordPress HTML Editor.'
1313

1414
# This description is used to generate tags and improve search results.

0 commit comments

Comments
 (0)