TouchInstinct
/
RxSwift
303
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adapts UITextView extensions to Swift 3.0 syntax.

This commit is contained in:
Krunoslav Zaher 2016-09-03 22:58:56 +02:00
parent 4980dd13e4
commit 1afcf5a8e1
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
RxCocoa/iOS/UITextView+Rx.swift
View File

@ -69,8 +69,8 @@ extension Reactive where Base: UITextView {
/**
Reactive wrapper for `delegate` message.
*/
public var rx_didBeginEditing: ControlEvent<()> {
return ControlEvent<()>(events: self.rx_delegate.observe(#selector(UITextViewDelegate.textViewDidBeginEditing(_:)))
public var didBeginEditing: ControlEvent<()> {
return ControlEvent<()>(events: self.delegate.observe(#selector(UITextViewDelegate.textViewDidBeginEditing(_:)))
.map { a in
return ()
})
@ -79,8 +79,8 @@ extension Reactive where Base: UITextView {
/**
Reactive wrapper for `delegate` message.
*/
public var rx_didEndEditing: ControlEvent<()> {
return ControlEvent<()>(events: self.rx_delegate.observe(#selector(UITextViewDelegate.textViewDidEndEditing(_:)))
public var didEndEditing: ControlEvent<()> {
return ControlEvent<()>(events: self.delegate.observe(#selector(UITextViewDelegate.textViewDidEndEditing(_:)))
.map { a in
return ()
})
@ -89,8 +89,8 @@ extension Reactive where Base: UITextView {
/**
Reactive wrapper for `delegate` message.
*/
public var rx_didChange: ControlEvent<()> {
return ControlEvent<()>(events: self.rx_delegate.observe(#selector(UITextViewDelegate.textViewDidChange(_:)))
public var didChange: ControlEvent<()> {
return ControlEvent<()>(events: self.delegate.observe(#selector(UITextViewDelegate.textViewDidChange(_:)))
.map { a in
return ()
})
@ -99,8 +99,8 @@ extension Reactive where Base: UITextView {
/**
Reactive wrapper for `delegate` message.
*/
public var rx_didChangeSelection: ControlEvent<()> {
return ControlEvent<()>(events: self.rx_delegate.observe(#selector(UITextViewDelegate.textViewDidChangeSelection(_:)))
public var didChangeSelection: ControlEvent<()> {
return ControlEvent<()>(events: self.delegate.observe(#selector(UITextViewDelegate.textViewDidChangeSelection(_:)))
.map { a in
return ()
})

16
Tests/RxCocoaTests/UITextView+RxTests.swift
View File

@ -34,9 +34,9 @@ class UITextViewTests : RxTest {
var value: ()?
autoreleasepool {
let textView = UITextView(frame: CGRectMake(0, 0, 1, 1))
let textView = UITextView(frame: CGRect(x: 0, y: 0, width: 1, height: 1))
_ = textView.rx_didBeginEditing.subscribe(onNext: { n in
_ = textView.rx.didBeginEditing.subscribe(onNext: { n in
value = n
}, onCompleted: {
completed = true
@ -54,9 +54,9 @@ class UITextViewTests : RxTest {
var value: ()?
autoreleasepool {
let textView = UITextView(frame: CGRectMake(0, 0, 1, 1))
let textView = UITextView(frame: CGRect(x: 0, y: 0, width: 1, height: 1))
_ = textView.rx_didEndEditing.subscribe(onNext: { n in
_ = textView.rx.didEndEditing.subscribe(onNext: { n in
value = n
}, onCompleted: {
completed = true
@ -74,9 +74,9 @@ class UITextViewTests : RxTest {
var value: ()?
autoreleasepool {
let textView = UITextView(frame: CGRectMake(0, 0, 1, 1))
let textView = UITextView(frame: CGRect(x: 0, y: 0, width: 1, height: 1))
_ = textView.rx_didChange.subscribe(onNext: { n in
_ = textView.rx.didChange.subscribe(onNext: { n in
value = n
}, onCompleted: {
completed = true
@ -94,9 +94,9 @@ class UITextViewTests : RxTest {
var value: ()?
autoreleasepool {
let textView = UITextView(frame: CGRectMake(0, 0, 1, 1))
let textView = UITextView(frame: CGRect(x: 0, y: 0, width: 1, height: 1))
_ = textView.rx_didChangeSelection.subscribe(onNext: { n in
_ = textView.rx.didChangeSelection.subscribe(onNext: { n in
value = n
}, onCompleted: {
completed = true