Skip to content

Commit

Permalink
Merge pull request #40 from feature/read-write-disposebag
Browse files Browse the repository at this point in the history
Make rx.disposeBag read/write
  • Loading branch information
freak4pc authored May 17, 2017
2 parents 43e82eb + 4d774c6 commit ff2c021
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 2 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ Changelog
Current master
--------------

- Make rx.disposeBag read/write ([#40](https://github.com/RxSwiftCommunity/NSObject-Rx/pull/40)) - [@freak4pc](https://github.com/freak4pc)

- Change macOS minimum deployment target to 10.10 to support RxSwift 3.0 ([#39](https://github.com/RxSwiftCommunity/NSObject-Rx/pull/29)) - [@freak4pc](https://github.com/freak4pc)

- Allow usage of rx.disposeBag alongside rx_disposeBag ([#29](https://github.com/RxSwiftCommunity/NSObject-Rx/pull/29)) - [@freak4pc](https://github.com/freak4pc)
Expand Down
3 changes: 2 additions & 1 deletion NSObject+Rx.swift
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ public extension NSObject {

public extension Reactive where Base: NSObject {
var disposeBag: DisposeBag {
return base.rx_disposeBag
get { return base.rx_disposeBag }
set { base.rx_disposeBag = newValue }
}
}

0 comments on commit ff2c021

Please sign in to comment.