Merge pull request #29 from freak4pc/patch-1

Allow usage of rx.disposeBag alongside rx_disposeBag
RxSwiftCommunity · Jan 2, 2017 · a578b94 · a578b94
2 parents b120679 + dd3ce4b
commit a578b94
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Changelog.md b/Changelog.md
@@ -4,7 +4,7 @@ Changelog
 Current master
 --------------
 
-- Nothing yet!
+- Allow usage of rx.disposeBag alongside rx_disposeBag ([#29](https://github.com/RxSwiftCommunity/NSObject-Rx/pull/29)) - [@freak4pc](https://github.com/freak4pc)
 
 2.0.0
 -----

diff --git a/NSObject+Rx.swift b/NSObject+Rx.swift
@@ -35,3 +35,9 @@ public extension NSObject {
         }
     }
 }
+
+extension Reactive where Base: NSObject {
+    var disposeBag: DisposeBag {
+        return base.rx_disposeBag
+    }
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ Changelog @@
     Current master
     --------------
-    - Nothing yet!
+    - Allow usage of rx.disposeBag alongside rx_disposeBag ([#29](https://github.com/RxSwiftCommunity/NSObject-Rx/pull/29)) - [@freak4pc](https://github.com/freak4pc)
 .0.0
     -----
@@ Expand Down @@