Merge pull request #463 from keymanapp/ios-fix-spacebar-subkey

Display blank subkey if no text is given
This commit is contained in:
Gabriel Wong 2017-12-01 10:34:55 +07:00 • committed by GitHub
commit c5ef61c034
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -196,19 +196,12 @@ extension KeymanWebViewController: WKScriptMessageHandler {
for key in keyArray {
let values = key.components(separatedBy: ":")
switch values.count {
case 1:
subkeyIDs.append(values[0])
subkeyTexts.append("")
case 2:
subkeyIDs.append(values[0])
subkeyTexts.append(values[1].stringFromUTF16CodeUnits()!)
case 1:
subkeyIDs.append(values[0])
var text = values[0]
if let index = text.index(of: "-") {
text = String(text[text.index(after: index)...])
}
if let index = text.index(of: "_") {
text = String(text[text.index(after: index)...])
}
subkeyTexts.append(text.stringFromUTF16CodeUnits()!)
default:
Manager.shared.kmLog("Unexpected subkey key: \(key)", checkDebugPrinting: false)
}