nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-14 15:12:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Content bindings reverted. Werent' updating the UI correctly

Browse Source
This commit is contained in:
michael starke
2015-06-08 15:33:58 +02:00
parent 0be2b677b8
commit 9a99261edd
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
MacPass/MPEntryViewController.m
View File

@@ -368,8 +368,8 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
if(!document.selectedGroup && !document.hasSearch) { if(!document.selectedGroup && !document.hasSearch) {
/* no group selection out of search is wrong */ /* no group selection out of search is wrong */
//[self.entryArrayController unbind:NSContentArrayBinding]; [self.entryArrayController unbind:NSContentArrayBinding];
self.entryArrayController.content = nil; [self.entryArrayController setContent:nil];
return; return;
} }
/* /*
@@ -387,7 +387,7 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
return; // we are showing the correct object right now. return; // we are showing the correct object right now.
} }
} }
self.entryArrayController.content = document.selectedGroup.entries; [self.entryArrayController bind:NSContentArrayBinding toObject:document.selectedGroup withKeyPath:NSStringFromSelector(@selector(entries)) options:nil];
} }
[self _updateContextBar]; [self _updateContextBar];
} }
@@ -422,7 +422,8 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
NSArray *result = [notification userInfo][kMPDocumentSearchResultsKey]; NSArray *result = [notification userInfo][kMPDocumentSearchResultsKey];
NSAssert(result != nil, @"Resutls should never be nil"); NSAssert(result != nil, @"Resutls should never be nil");
self.filteredEntries = result; self.filteredEntries = result;
self.entryArrayController.content = self.filteredEntries; [self.entryArrayController unbind:NSContentArrayBinding];
[self.entryArrayController setContent:self.filteredEntries];
[[self.entryTable tableColumnWithIdentifier:MPEntryTableParentColumnIdentifier] setHidden:NO]; [[self.entryTable tableColumnWithIdentifier:MPEntryTableParentColumnIdentifier] setHidden:NO];
} }
@@ -432,7 +433,8 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
MPDocument *document = [[self windowController] document]; MPDocument *document = [[self windowController] document];
document.selectedItem = document.selectedGroup; document.selectedItem = document.selectedGroup;
if( nil == document.selectedItem && nil == document.selectedGroup ) { if( nil == document.selectedItem && nil == document.selectedGroup ) {
self.entryArrayController.content = nil; [self.entryArrayController unbind:NSContentArrayBinding];
[self.entryArrayController setContent:nil];
} }
[self _updateContextBar]; [self _updateContextBar];
} }
@@ -454,7 +456,7 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
[self _showContextBar]; [self _showContextBar];
/* TODO: Show modification date column if not present? */ /* TODO: Show modification date column if not present? */
MPDocument *document = [[self windowController] document]; MPDocument *document = [[self windowController] document];
self.entryArrayController.content = document.selectedEntry.history; [self.entryArrayController bind:NSContentArrayBinding toObject:document.selectedEntry withKeyPath:NSStringFromSelector(@selector(history)) options:nil];
} }
- (void)_didExitHistory:(NSNotification *)notification { - (void)_didExitHistory:(NSNotification *)notification {