diff --git a/External/ReactiveCocoa b/External/ReactiveCocoa index d942f42..d1cddce 160000 --- a/External/ReactiveCocoa +++ b/External/ReactiveCocoa @@ -1 +1 @@ -Subproject commit d942f4275da12bbf16753f2d1ea05d531ae92196 +Subproject commit d1cddcef521fc8d200fe45b66af7b41f066341ba diff --git a/ReactiveViewModel/RVMViewModel.m b/ReactiveViewModel/RVMViewModel.m index 50fc577..fd595c3 100644 --- a/ReactiveViewModel/RVMViewModel.m +++ b/ReactiveViewModel/RVMViewModel.m @@ -48,7 +48,7 @@ static const NSTimeInterval RVMViewModelInactiveThrottleInterval = 1; if (_didBecomeActiveSignal == nil) { @weakify(self); - _didBecomeActiveSignal = [[[RACObserve(self.active) + _didBecomeActiveSignal = [[[RACObserve(self, active) filter:^(NSNumber *active) { return active.boolValue; }] @@ -66,7 +66,7 @@ static const NSTimeInterval RVMViewModelInactiveThrottleInterval = 1; if (_didBecomeInactiveSignal == nil) { @weakify(self); - _didBecomeInactiveSignal = [[[RACObserve(self.active) + _didBecomeInactiveSignal = [[[RACObserve(self, active) filter:^ BOOL (NSNumber *active) { return !active.boolValue; }] @@ -100,7 +100,7 @@ static const NSTimeInterval RVMViewModelInactiveThrottleInterval = 1; - (RACSignal *)forwardSignalWhileActive:(RACSignal *)signal { NSParameterAssert(signal != nil); - RACSignal *activeSignal = RACObserve(self.active); + RACSignal *activeSignal = RACObserve(self, active); return [[RACSignal createSignal:^(id subscriber) { @@ -139,7 +139,7 @@ static const NSTimeInterval RVMViewModelInactiveThrottleInterval = 1; signal = [signal replayLast]; - return [[[[[RACObserve(self.active) + return [[[[[RACObserve(self, active) takeUntil:[signal ignoreValues]] combineLatestWith:signal] throttle:RVMViewModelInactiveThrottleInterval valuesPassingTest:^ BOOL (RACTuple *xs) { @@ -163,11 +163,4 @@ static const NSTimeInterval RVMViewModelInactiveThrottleInterval = 1; return [super automaticallyNotifiesObserversForKey:key]; } -- (void)setNilValueForKey:(NSString *)key { - // Ignore attempts to set primitive properties to nil. This is commonly - // caused by RACObserve noticing an intermediate key change. - // - // See https://github.com/ReactiveCocoa/ReactiveCocoa/issues/631. -} - @end