Revision 9150ada1 Classes/FolderViewController.m
| b/Classes/FolderViewController.m | ||
|---|---|---|
| 126 | 126 |
int rootFolderControllerIndex = [viewControllers indexOfObject:self.containersViewController] + 1; |
| 127 | 127 |
FolderViewController *rootFolderViewController = [viewControllers objectAtIndex:rootFolderControllerIndex]; |
| 128 | 128 |
rootFolderViewController.folder = self.container.rootFolder; |
| 129 |
[rootFolderViewController reloadData]; |
|
| 130 | 129 |
|
| 131 | 130 |
for (int i = rootFolderControllerIndex + 1; i < [viewControllers count]; i++) {
|
| 132 | 131 |
FolderViewController *folderViewController = [viewControllers objectAtIndex:i]; |
| 133 | 132 |
Folder *parentFolder = folderViewController.parentFolderViewController.folder; |
| 134 | 133 |
|
| 135 | 134 |
folderViewController.folder = [parentFolder.folders objectForKey:folderViewController.folder.name]; |
| 136 |
if (folderViewController.folder) {
|
|
| 137 |
[folderViewController reloadData]; |
|
| 138 |
} else {
|
|
| 135 |
if (!folderViewController.folder) |
|
| 139 | 136 |
folderViewController.folderHasBeenRemoved = YES; |
| 140 |
} |
|
| 141 | 137 |
} |
| 142 | 138 |
if (!self.folder || (account.shared && !folder.objectsAndFoldersCount)) {
|
| 143 | 139 |
if (needsRefreshing && self.parentFolderViewController) {
|
| ... | ... | |
| 210 | 206 |
[folder release]; |
| 211 | 207 |
folder = [aFolder retain]; |
| 212 | 208 |
[self showSearchBar:(self.contentsLoaded && self.folder && self.folder.objectsAndFoldersCount)]; |
| 209 |
[self reloadData]; |
|
| 213 | 210 |
} |
| 214 | 211 |
|
| 215 | 212 |
#pragma mark - Actions |
| ... | ... | |
| 258 | 255 |
#pragma mark - UIScrollViewDelegate |
| 259 | 256 |
|
| 260 | 257 |
- (void)scrollViewDidScroll:(UIScrollView *)scrollView {
|
| 261 |
if ((UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) && !self.searchBar.hidden && !self.searchDisplayController.active) {
|
|
| 258 |
if ((UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) && (scrollView == self.tableView) && |
|
| 259 |
!self.searchBar.hidden && !self.searchDisplayController.active) {
|
|
| 262 | 260 |
CGRect searchBarFrame = self.searchBar.frame; |
| 263 | 261 |
searchBarFrame.origin.y = scrollView.contentOffset.y; |
| 264 | 262 |
searchBar.frame = searchBarFrame; |
| ... | ... | |
| 558 | 556 |
|
| 559 | 557 |
if ((self.folder.parent && !self.folder.parent.objectsAndFoldersCount) || |
| 560 | 558 |
(!self.folder.parent && !self.container.rootFolder.objectsAndFoldersCount)) {
|
| 561 |
[self.parentFolderViewController reloadData]; |
|
| 562 | 559 |
self.parentFolderViewController.folder = self.parentFolderViewController.folder; |
| 563 | 560 |
} else if ((self.folder.parent && self.folder.parent.objectsAndFoldersCount) || |
| 564 | 561 |
(!self.folder.parent && self.container.rootFolder.objectsAndFoldersCount)) {
|
Also available in: Unified diff