Merge pull request #1286 from wordpress-mobile/release/1.19.1

Release/1.19.1
wordpress-mobile · May 12, 2020 · be24064 · be24064
2 parents 26443eb + bb5316b
commit be24064
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/Aztec/Classes/Libxml2/Converters/In/HTMLParser.swift b/Aztec/Classes/Libxml2/Converters/In/HTMLParser.swift
@@ -45,12 +45,16 @@ open class HTMLParser {
         //
         htmlHandleOmittedElem(0)
 
+        var parserOptions = HTML_PARSE_RECOVER.rawValue | HTML_PARSE_NODEFDTD.rawValue | HTML_PARSE_NOERROR.rawValue | HTML_PARSE_NOWARNING.rawValue | HTML_PARSE_NOIMPLIED.rawValue
+        if shouldCollapseSpaces {
+            parserOptions = parserOptions | HTML_PARSE_NOBLANKS.rawValue
+        }
         let document = htmlCtxtReadMemory(parserContext,
                                           htmlPtr,
                                           Int32(wrappedHTML.lengthOfBytes(using: String.Encoding.utf8)),
                                           "",
                                           "UTF-8",
-                                          Int32(HTML_PARSE_RECOVER.rawValue | HTML_PARSE_NODEFDTD.rawValue | HTML_PARSE_NOERROR.rawValue | HTML_PARSE_NOWARNING.rawValue | HTML_PARSE_NOIMPLIED.rawValue | HTML_PARSE_NOBLANKS.rawValue))
+                                          Int32(parserOptions))
 
         defer {
             xmlFreeDoc(document)

diff --git a/AztecTests/TextKit/TextStorageTests.swift b/AztecTests/TextKit/TextStorageTests.swift
@@ -566,7 +566,7 @@ class TextStorageTests: XCTestCase {
     /// Verifies that spaces are not collapsed
     ///
     func testConverterCollapsesSpacesText() {
-        let initialHTML = "<p>  Hello  World  </p>"
+        let initialHTML = "<p>  Hello  <br>   <strong>World</strong>  </p>"
 
         // Setup
         let defaultAttributes: [NSAttributedString.Key: Any] = [.font: UIFont.systemFont(ofSize: 14),
@@ -575,7 +575,7 @@ class TextStorageTests: XCTestCase {
         storage.htmlConverter.shouldCollapseSpaces = false
         storage.setHTML(initialHTML, defaultAttributes: defaultAttributes)
 
-        let expectedResult = "<p>  Hello  World  </p>"
+        let expectedResult = "<p>  Hello  <br>   <strong>World</strong>  </p>"
         let result = storage.getHTML()
         XCTAssertEqual(expectedResult, result)
     }

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+1.19.1
+-------
+* Fix a bug where collapse of whitespaces was happening for empty HTML nodes.
+
 1.19.0
 -------
 * Add support for the sup and sub HTML tags.

diff --git a/WordPress-Aztec-iOS.podspec b/WordPress-Aztec-iOS.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'WordPress-Aztec-iOS'
-  s.version          = '1.19.0'
+  s.version          = '1.19.1'
   s.summary          = 'The native HTML Editor.'
 
 # This description is used to generate tags and improve search results.

diff --git a/WordPress-Editor-iOS.podspec b/WordPress-Editor-iOS.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'WordPress-Editor-iOS'
-  s.version          = '1.19.0'
+  s.version          = '1.19.1'
   s.summary          = 'The WordPress HTML Editor.'
 
 # This description is used to generate tags and improve search results.