From e60ad6cb302968ab26987512ce24a6f21990cc40 Mon Sep 17 00:00:00 2001 From: Sami Samhuri Date: Sat, 24 Mar 2012 11:00:48 -0700 Subject: [PATCH] fix navigating to the current episode on iPad --- 5by5Browser/SSMasterViewController.m | 4 +++- .../en.lproj/SSMasterViewController_iPhone.xib | 16 +++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/5by5Browser/SSMasterViewController.m b/5by5Browser/SSMasterViewController.m index cad12b8..5a527ba 100644 --- a/5by5Browser/SSMasterViewController.m +++ b/5by5Browser/SSMasterViewController.m @@ -173,7 +173,9 @@ NSURL *url = [NSURL URLWithString: [self.currentShow webURLForEpisodeNumber: self.currentEpisodeNumber]]; Episode *episode = [Episode episodeWithShow: self.currentShow name: self.currentEpisodeName number: self.currentEpisodeNumber date: nil url: url]; self.showViewController.detailViewController.episode = episode; - [self.navigationController pushViewController: self.showViewController.detailViewController animated: YES]; + if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone) { + [self.navigationController pushViewController: self.showViewController.detailViewController animated: YES]; + } } else { [[self.fiveByFive.shows objectAtIndex: indexPath.row] getEpisodes]; diff --git a/5by5Browser/en.lproj/SSMasterViewController_iPhone.xib b/5by5Browser/en.lproj/SSMasterViewController_iPhone.xib index f68b090..549f5fb 100644 --- a/5by5Browser/en.lproj/SSMasterViewController_iPhone.xib +++ b/5by5Browser/en.lproj/SSMasterViewController_iPhone.xib @@ -2,13 +2,13 @@ 1280 - 11C74 - 2148 - 1138.23 - 567.00 + 11D50 + 2166 + 1138.32 + 568.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1145 + 1166 IBProxyObject @@ -36,7 +36,6 @@ {{0, 20}, {320, 460}} - 3 MQA @@ -47,7 +46,6 @@ YES 1 0 - YES 44 22 22 @@ -123,7 +121,7 @@ ShowViewController - UIViewController + UITableViewController IBProjectSource ./Classes/ShowViewController.h @@ -135,6 +133,6 @@ IBCocoaTouchFramework YES 3 - 1145 + 1166