fixing done button

This commit is contained in:
Roy Yang 2012-06-19 14:06:37 -07:00
parent 1d810d6e85
commit 3321989eff
5 changed files with 11 additions and 5 deletions

View file

@ -116,6 +116,7 @@
- (void)showFeedsMenu;
- (void)hideFeedsMenu;
- (void)showAdd;
- (void)showMasterPopover;
- (void)showPopover;
- (void)showMoveSite;
- (void)loadFeedDetailView;

View file

@ -209,7 +209,7 @@
[firstTimeUserViewController selectGoogleReaderButton];
}
- (void)showPopover {
- (void)showMasterPopover {
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
[splitStoryDetailViewController showPopover];
}

View file

@ -39,6 +39,7 @@
@property (nonatomic, retain) IBOutlet UIView *feedTitleGradient;
@property (retain,nonatomic) UIPopoverController *popoverController;
- (void)showPopover;
- (void)setNextPreviousButtons;
- (void)markStoryAsRead;
- (void)showStory;

View file

@ -75,6 +75,7 @@
return YES;
}
- (void)viewWillAppear:(BOOL)animated {
// NSLog(@"Stories; %@ -- %@ (%d)", self.activeStoryId, [appDelegate.activeStory objectForKey:@"id"], self.activeStoryId == [appDelegate.activeStory objectForKey:@"id"]);
id storyId = [appDelegate.activeStory objectForKey:@"id"];
@ -390,6 +391,7 @@ shouldStartLoadWithRequest:(NSURLRequest *)request
popToViewController:[appDelegate.navigationController.viewControllers
objectAtIndex:0]
animated:YES];
[appDelegate showMasterPopover];
} else {
[appDelegate setActiveStory:[[appDelegate activeFeedStories]
objectAtIndex:nextIndex]];
@ -417,6 +419,7 @@ shouldStartLoadWithRequest:(NSURLRequest *)request
popToViewController:[appDelegate.navigationController.viewControllers
objectAtIndex:0]
animated:YES];
[appDelegate showMasterPopover];
} else {
int previousIndex = [appDelegate locationOfStoryId:previousStoryId];
if (previousIndex == -1) {

View file

@ -64,11 +64,12 @@
[appDelegate adjustStoryDetailWebView];
}
- (void)showPopover
{
- (void)showPopover {
if (self.masterPopoverController) {
[self.masterPopoverController presentPopoverFromRect:CGRectMake(0, 0, 1, 1) inView:self.view
permittedArrowDirections:UIPopoverArrowDirectionAny animated:YES];
[self.masterPopoverController presentPopoverFromRect:CGRectMake(0, 0, 1, 1)
inView:self.view
permittedArrowDirections:UIPopoverArrowDirectionAny
animated:YES];
}
}