Skip to content

Makes <WEPopoverControllerDelegate> Methods optional to implement, checks for implementation before invoking them #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
idevsoftware wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Makes <WEPopoverControllerDelegate> Methods optional to implement, checks for implementation before invoking them #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Classes/Popover/WEPopoverController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

@protocol WEPopoverControllerDelegate<NSObject>

@optional

- (void)popoverControllerDidDismissPopover:(WEPopoverController *)popoverController;
- (BOOL)popoverControllerShouldDismissPopover:(WEPopoverController *)popoverController;

Expand Down
13 changes: 10 additions & 3 deletions Classes/Popover/WEPopoverController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,10 @@ - (void)animationDidStop:(NSString *)animationID finished:(NSNumber *)finished c

if (userInitiatedDismissal) {
//Only send message to delegate in case the user initiated this event, which is if he touched outside the view
[delegate popoverControllerDidDismissPopover:self];
if(delegate != nil && [delegate conformsToProtocol:@protocol(WEPopoverControllerDelegate)] &&
[delegate respondsToSelector:@selector(popoverControllerDidDismissPopover:)]) {
[delegate popoverControllerDidDismissPopover:self];
}
}
}
}
Expand Down Expand Up @@ -246,9 +249,13 @@ - (void)repositionPopoverFromRect:(CGRect)rect

- (void)viewWasTouched:(WETouchableView *)view {
if (popoverVisible) {
if (!delegate || [delegate popoverControllerShouldDismissPopover:self]) {
[self dismissPopoverAnimated:YES userInitiated:YES];
BOOL shouldDismiss = YES;
if(delegate != nil && [delegate conformsToProtocol:@protocol(WEPopoverControllerDelegate)] &&
[delegate respondsToSelector:@selector(popoverControllerShouldDismissPopover:)]) {
shouldDismiss = [delegate popoverControllerShouldDismissPopover:self];
}
if(shouldDismiss)
[self dismissPopoverAnimated:YES userInitiated:YES];
}
}

Expand Down