Skip to content

Add observation to MAKVONotification #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add observation to MAKVONotification #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions MAKVONotificationCenter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ enum
@property(strong,readonly) id __attribute__((ns_returns_not_retained)) newValue;
@property(strong,readonly) NSIndexSet *indexes;
@property(assign,readonly) BOOL isPrior;
@property(assign, readonly) id<MAKVOObservation> observation;

@end

Expand Down
7 changes: 4 additions & 3 deletions MAKVONotificationCenter.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ @interface MAKVONotification ()
NSDictionary *change;
}

- (id)initWithObserver:(id)observer_ object:(id)target_ keyPath:(NSString *)keyPath_ change:(NSDictionary *)change_;
- (id)initWithObserver:(id)observer_ object:(id)target_ keyPath:(NSString *)keyPath_ change:(NSDictionary *)change_ helper:(id<MAKVOObservation>)helper;

@property(copy,readwrite) NSString *keyPath;
@property(assign,readwrite) id observer, target;
Expand All @@ -37,14 +37,15 @@ @implementation MAKVONotification

@synthesize keyPath, observer, target;

- (id)initWithObserver:(id)observer_ object:(id)target_ keyPath:(NSString *)keyPath_ change:(NSDictionary *)change_
- (id)initWithObserver:(id)observer_ object:(id)target_ keyPath:(NSString *)keyPath_ change:(NSDictionary *)change_ helper:(id<MAKVOObservation>)helper
{
if ((self = [super init]))
{
self.observer = observer_;
self.target = target_;
self.keyPath = keyPath_;
change = change_;
_observation = helper;
}
return self;
}
Expand Down Expand Up @@ -142,7 +143,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N

// Pass object instead of _target as the notification object so that
// array observations will work as expected.
notification = [[MAKVONotification alloc] initWithObserver:_observer object:object keyPath:keyPath change:change];
notification = [[MAKVONotification alloc] initWithObserver:_observer object:object keyPath:keyPath change:change helper:self];
((void (^)(MAKVONotification *))_userInfo)(notification);
}
#endif
Expand Down