Merge branch 'bugfix/typos' into 'develop'

Bugfix/typos

See merge request BPHV_MIPS/mvm_core_ui!105
This commit is contained in:
Pfeil, Scott Robert 2019-08-01 11:53:33 -04:00
commit 9e3eaf0d1e
2 changed files with 6 additions and 1 deletions

View File

@ -114,6 +114,11 @@
} else { } else {
self.hidden = YES; self.hidden = YES;
} }
NSString *colorString = [json string:KeyBackgroundColor];
if (colorString) {
self.backgroundColor = [UIColor mfGetColorForHex:colorString];
}
} }
#pragma mark - helper #pragma mark - helper

View File

@ -98,7 +98,7 @@ import UIKit
} }
// Add the caret if there is an action and it's not declared hidden. // Add the caret if there is an action and it's not declared hidden.
if let _ = json?.optionalDictionaryForKey("actionMap"), json!.boolForKey("hideArrow") { if let _ = json?.optionalDictionaryForKey("actionMap"), !json!.boolForKey("hideArrow") {
addCaretViewAccessory() addCaretViewAccessory()
} else { } else {
accessoryView = nil accessoryView = nil