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

Fixed #657 exiting history display does not break entry display

Browse Source
This commit is contained in:
michael starke
2017-10-09 19:34:41 +02:00
parent d9b9cd78cb
commit 21ea2a5bc9
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cartfile
View File

@@ -1,3 +1,3 @@
github "sparkle-project/Sparkle" ~> 1.18.1 github "sparkle-project/Sparkle" ~> 1.18.1
github "mstarke/KeePassKit" "a0d459f52e0d4d3c0b0fba92de6dc54ddffba486" github "mstarke/KeePassKit" "6cf17cc6f730c72b02d69ef4becdaceabbc15bd7"
github "mstarke/HNHUi" ~> 1.1 github "mstarke/HNHUi" ~> 1.1

2
Cartfile.resolved
View File

@@ -1,3 +1,3 @@
github "mstarke/HNHUi" "1.2" github "mstarke/HNHUi" "1.2"
github "mstarke/KeePassKit" "a0d459f52e0d4d3c0b0fba92de6dc54ddffba486" github "mstarke/KeePassKit" "6cf17cc6f730c72b02d69ef4becdaceabbc15bd7"
github "sparkle-project/Sparkle" "1.18.1" github "sparkle-project/Sparkle" "1.18.1"

10
MacPass/MPEntryViewController.m
View File

@@ -112,8 +112,7 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
_dataSource.viewController = self; _dataSource.viewController = self;
_menuDelegate = [[MPEntryContextMenuDelegate alloc] init]; _menuDelegate = [[MPEntryContextMenuDelegate alloc] init];
_contextBarViewController = [[MPContextBarViewController alloc] init]; _contextBarViewController = [[MPContextBarViewController alloc] init];
NSString *entriesKeyPath = [NSString stringWithFormat:@"%@.%@", NSStringFromSelector(@selector(representedObject)), KPKEntriesArrayBinding]; [self _setupEntryBindings];
[_entryArrayController bind:NSContentArrayBinding toObject:self withKeyPath:entriesKeyPath options:@{NSNullPlaceholderBindingOption: @[]}];
} }
return self; return self;
} }
@@ -517,7 +516,7 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
- (void)_hideEntryHistory:(NSNotification *)notification { - (void)_hideEntryHistory:(NSNotification *)notification {
self.displayMode = MPDisplayModeEntries; self.displayMode = MPDisplayModeEntries;
[self.entryArrayController unbind:NSContentArrayBinding]; [self _setupEntryBindings];
self.entryArrayController.content = nil; self.entryArrayController.content = nil;
[self _updateContextBar]; [self _updateContextBar];
MPDocument *document = notification.object; MPDocument *document = notification.object;
@@ -542,6 +541,11 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
} }
} }
- (void)_setupEntryBindings {
NSString *entriesKeyPath = [NSString stringWithFormat:@"%@.%@", NSStringFromSelector(@selector(representedObject)), KPKEntriesArrayBinding];
[self.entryArrayController bind:NSContentArrayBinding toObject:self withKeyPath:entriesKeyPath options:@{NSNullPlaceholderBindingOption: @[]}];
}
- (void)_showContextBar { - (void)_showContextBar {
if(_isDisplayingContextBar) { if(_isDisplayingContextBar) {
return; return;