Skip to content
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

API upgrades #94

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+123 −59
Open

API upgrades #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59a2cbf
require ARC
justbuchanan Dec 2, 2013
e42ab8f
point Podspec at BluMenlo repo, master branch
justbuchanan Dec 2, 2013
e40fe7d
Allow the API user to specify how the view should behave when touched…
goff-marocchi Dec 13, 2013
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
3 changes: 2 additions & 1 deletion FPPopover.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ Pod::Spec.new do |s|
s.homepage = 'http://www.gingerbeard.me'
s.author = { 'Alvise Susmel' => '[email protected]' }

s.source = { :git => 'https://github.com/50pixels/FPPopover.git', :tag => '1.4.1' }
s.source = { :git => 'https://github.com/BluMenlo/FPPopover.git', :branch => :master }
s.platform = :ios
s.source_files = '*.{h,m}'
s.requires_arc = true

s.frameworks = 'QuartzCore', 'UIKit'
end
21 changes: 17 additions & 4 deletions FPPopoverController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

@optional
- (void)popoverControllerDidDismissPopover:(FPPopoverController *)popoverController;
- (void)presentedNewPopoverController:(FPPopoverController *)newPopoverController
- (void)presentedNewPopoverController:(FPPopoverController *)newPopoverController
shouldDismissVisiblePopover:(FPPopoverController*)visiblePopoverController;
@end

Expand All @@ -31,9 +31,9 @@
}
//ARC-enable and disable support
#if __has_feature(objc_arc)
@property(nonatomic,weak) id<FPPopoverControllerDelegate> delegate;
@property(nonatomic,weak) id<FPPopoverControllerDelegate> delegate;
#else
@property(nonatomic,assign) id<FPPopoverControllerDelegate> delegate;
@property(nonatomic,assign) id<FPPopoverControllerDelegate> delegate;
#endif

/** @brief FPPopoverArrowDirectionAny, FPPopoverArrowDirectionVertical or FPPopoverArrowDirectionHorizontal for automatic arrow direction.
Expand All @@ -55,11 +55,24 @@
/** @brief Popover border, default is YES **/
@property(nonatomic, assign) BOOL border;

/** @brief Popover dismiss upon touch, default is YES **/
@property(nonatomic, assign) BOOL dismissUponTouch;

/** @brief Initialize the popover with the content view controller
**/
-(id)initWithViewController:(UIViewController*)viewController;
-(id)initWithViewController:(UIViewController*)viewController
delegate:(id<FPPopoverControllerDelegate>)delegate;
delegate:(id<FPPopoverControllerDelegate>)delegate
autoresizingMask:(UIViewAutoresizing)autoresizingMask;
-(id)initWithViewController:(UIViewController*)viewController
delegate:(id<FPPopoverControllerDelegate>)delegate
autoresizingMask:(UIViewAutoresizing)autoresizingMask
contentSize:(CGSize)contentSize;
-(id)initWithViewController:(UIViewController*)viewController
delegate:(id<FPPopoverControllerDelegate>)delegate
autoresizingMask:(UIViewAutoresizing)autoresizingMask
contentSize:(CGSize)contentSize
dismissUponTouch:(BOOL)dismissUponTouch;

/** @brief Presenting the popover from a specified view **/
-(void)presentPopoverFromView:(UIView*)fromView;
Expand Down
Loading