From 166bb815c64c0e048eaf37d2efff7891254c4ec1 Mon Sep 17 00:00:00 2001 From: Chris Li Date: Sat, 1 Oct 2016 15:05:47 -0400 Subject: [PATCH] toc trim white char --- Kiwix-iOS/Info.plist | 2 +- Kiwix-iOSWidgets/Bookmarks/Info.plist | 2 +- Kiwix/Tools/HTMLHeading.swift | 2 +- Kiwix/URLProtocol/KiwixURLProtocol.swift | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Kiwix-iOS/Info.plist b/Kiwix-iOS/Info.plist index 59bdd0d0..9aaf49b9 100644 --- a/Kiwix-iOS/Info.plist +++ b/Kiwix-iOS/Info.plist @@ -49,7 +49,7 @@ CFBundleVersion - 1.8.1550 + 1.8.1553 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/Kiwix-iOSWidgets/Bookmarks/Info.plist b/Kiwix-iOSWidgets/Bookmarks/Info.plist index 93a48209..0399f103 100644 --- a/Kiwix-iOSWidgets/Bookmarks/Info.plist +++ b/Kiwix-iOSWidgets/Bookmarks/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 1.8.1550 + 1.8.1553 NSExtension NSExtensionMainStoryboard diff --git a/Kiwix/Tools/HTMLHeading.swift b/Kiwix/Tools/HTMLHeading.swift index 4dc05dc4..23ec1ee5 100644 --- a/Kiwix/Tools/HTMLHeading.swift +++ b/Kiwix/Tools/HTMLHeading.swift @@ -15,7 +15,7 @@ class HTMLHeading { init?(rawValue: [String: String]) { let tagName = rawValue["tagName"] ?? "" self.id = rawValue["id"] ?? "" - self.textContent = rawValue["textContent"] ?? "" + self.textContent = (rawValue["textContent"] ?? "").stringByTrimmingCharactersInSet(.whitespaceCharacterSet()) self.tagName = tagName self.level = Int(tagName.stringByReplacingOccurrencesOfString("H", withString: "")) ?? -1 diff --git a/Kiwix/URLProtocol/KiwixURLProtocol.swift b/Kiwix/URLProtocol/KiwixURLProtocol.swift index f60f4dcf..e8aba30a 100644 --- a/Kiwix/URLProtocol/KiwixURLProtocol.swift +++ b/Kiwix/URLProtocol/KiwixURLProtocol.swift @@ -51,8 +51,6 @@ class KiwixURLProtocol: NSURLProtocol { } extension NSURL { - - class func kiwixURLWithZimFileid(id: String, contentURLString: String) -> NSURL? { guard let escapedContentURLString = contentURLString.stringByAddingPercentEncodingWithAllowedCharacters(.URLPathAllowedCharacterSet()) else {return nil} let baseURLString = "kiwix://" + id