From 8166b9be3f0d0b9319c64923ac12f565e4cc5cdf Mon Sep 17 00:00:00 2001 From: Sarah Gerweck Date: Mon, 10 Aug 2015 04:49:42 -0700 Subject: [PATCH] Improved return type --- src/main/scala/org/gerweck/scalafx/util/observable.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/org/gerweck/scalafx/util/observable.scala b/src/main/scala/org/gerweck/scalafx/util/observable.scala index cbebca6..7078ddb 100644 --- a/src/main/scala/org/gerweck/scalafx/util/observable.scala +++ b/src/main/scala/org/gerweck/scalafx/util/observable.scala @@ -141,7 +141,7 @@ class RichObservable[A, C](val self: ObservableValue[A, C]) extends AnyVal { def map[B](f: A => B) = oapp.map(self)(f) def flatMap[B](f: A => Observable[B]) = oapp.bind(self)(f) - def <*>[B](f: Observable[A => B]): Observable[B] = oapp.ap(self)(f) + def <*>[B](f: Observable[A => B]): ObservableValue[B, B] = oapp.ap(self)(f) def tuple[B](f: Observable[B]): Observable[(A,B)] = oapp.tuple2(self, f) final def *>[B](fb: ObjObs[B]): Observable[B] = oapp.apply2(self,fb)((_,b) => b) final def <*[B](fb: ObjObs[B]): Observable[A] = oapp.apply2(self,fb)((a,_) => a)