ReactiveX/RxSwift
1
1
Fork 0
mirror of https://github.com/ReactiveX/RxSwift.git synced 2024-10-05 06:27:29 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of github.com:ReactiveX/RxSwift into develop

Browse Source
This commit is contained in:
Krunoslav Zaher 2016-12-03 22:58:06 +01:00
commit da2bd27590
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file.
## Master
* Adds `didScroll` and `didZoom` `ControlEvent`s to `UIScrollView+Rx`
* Renames `refreshing` to `isRefreshing`.
## [3.0.1](https://github.com/ReactiveX/RxSwift/releases/tag/3.0.1) (Xcode 8 / Swift 3.0 compatible)

6
RxCocoa/iOS/UIRefreshControl+Rx.swift
View File

@ -16,7 +16,13 @@ import RxSwift
extension Reactive where Base: UIRefreshControl {
/// Bindable sink for `beginRefreshing()`, `endRefreshing()` methods.
@available(*, deprecated, renamed: "isRefreshing")
public var refreshing: UIBindingObserver<Base, Bool> {
return self.isRefreshing
}
/// Bindable sink for `beginRefreshing()`, `endRefreshing()` methods.
public var isRefreshing: UIBindingObserver<Base, Bool> {
return UIBindingObserver(UIElement: self.base) { refreshControl, refresh in
if refresh {
refreshControl.beginRefreshing()

4
Tests/RxCocoaTests/UIRefreshControl+RxTests.swift
View File

@ -20,14 +20,14 @@ class UIRefreshControlTests : RxTest {
extension UIRefreshControlTests {
func testRefreshing_True() {
let subject = UIRefreshControl()
Observable.just(true).subscribe(subject.rx.refreshing).dispose()
Observable.just(true).subscribe(subject.rx.isRefreshing).dispose()
XCTAssertTrue(subject.isRefreshing == true)
}
func testRefreshing_False() {
let subject = UIRefreshControl()
Observable.just(false).subscribe(subject.rx.refreshing).dispose()
Observable.just(false).subscribe(subject.rx.isRefreshing).dispose()
XCTAssertTrue(subject.isRefreshing == false)
}