mirror of
https://github.com/apache/cordova-plugin-camera.git
synced 2025-03-17 06:21:03 +08:00
CB-8351 ios: Stop using now-deprecated integerValueForKey: class extension
This commit is contained in:
parent
2a0735d551
commit
2ead6335c9
@ -173,6 +173,18 @@ static NSSet* org_apache_cordova_validArrowDirections;
|
|||||||
[self displayPopover:options];
|
[self displayPopover:options];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (NSInteger)integerValueForKey:(NSDictionary*)dict key:(NSString*)key defaultValue:(NSInteger)defaultValue
|
||||||
|
{
|
||||||
|
NSInteger value = defaultValue;
|
||||||
|
|
||||||
|
NSNumber* val = [self valueForKey:key]; // value is an NSNumber
|
||||||
|
|
||||||
|
if (val != nil) {
|
||||||
|
value = [val integerValue];
|
||||||
|
}
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
- (void)displayPopover:(NSDictionary*)options
|
- (void)displayPopover:(NSDictionary*)options
|
||||||
{
|
{
|
||||||
NSInteger x = 0;
|
NSInteger x = 0;
|
||||||
@ -182,11 +194,11 @@ static NSSet* org_apache_cordova_validArrowDirections;
|
|||||||
UIPopoverArrowDirection arrowDirection = UIPopoverArrowDirectionAny;
|
UIPopoverArrowDirection arrowDirection = UIPopoverArrowDirectionAny;
|
||||||
|
|
||||||
if (options) {
|
if (options) {
|
||||||
x = [options integerValueForKey:@"x" defaultValue:0];
|
x = [self integerValueForKey:options key:@"x" defaultValue:0];
|
||||||
y = [options integerValueForKey:@"y" defaultValue:32];
|
y = [self integerValueForKey:options key:@"y" defaultValue:32];
|
||||||
width = [options integerValueForKey:@"width" defaultValue:320];
|
width = [self integerValueForKey:options key:@"width" defaultValue:320];
|
||||||
height = [options integerValueForKey:@"height" defaultValue:480];
|
height = [self integerValueForKey:options key:@"height" defaultValue:480];
|
||||||
arrowDirection = [options integerValueForKey:@"arrowDir" defaultValue:UIPopoverArrowDirectionAny];
|
arrowDirection = [self integerValueForKey:options key:@"arrowDir" defaultValue:UIPopoverArrowDirectionAny];
|
||||||
if (![org_apache_cordova_validArrowDirections containsObject:[NSNumber numberWithUnsignedInteger:arrowDirection]]) {
|
if (![org_apache_cordova_validArrowDirections containsObject:[NSNumber numberWithUnsignedInteger:arrowDirection]]) {
|
||||||
arrowDirection = UIPopoverArrowDirectionAny;
|
arrowDirection = UIPopoverArrowDirectionAny;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user