diff options
author | Allan Wang <me@allanwang.ca> | 2017-10-07 15:15:10 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-07 15:15:10 -0400 |
commit | 1369aa283a2167cf2a9525bd856edd48c39eea21 (patch) | |
tree | 95230383143d2c9997b245058776425f62202e0f /app/src/main/kotlin/com/pitchedapps/frost/injectors/JsInjector.kt | |
parent | 6bca83c464337c37ebcbabe47f8a8e2e44dd4794 (diff) | |
download | frost-1369aa283a2167cf2a9525bd856edd48c39eea21.tar.gz frost-1369aa283a2167cf2a9525bd856edd48c39eea21.tar.bz2 frost-1369aa283a2167cf2a9525bd856edd48c39eea21.zip |
Add more css hiders (#373)
* Add more css hiders
* Add toggles and injectors
* Fix composer hider
* Update changelog
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/injectors/JsInjector.kt')
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/injectors/JsInjector.kt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsInjector.kt b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsInjector.kt index 9fafbf88..a29ff55e 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsInjector.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsInjector.kt @@ -1,6 +1,7 @@ package com.pitchedapps.frost.injectors import android.webkit.WebView +import com.pitchedapps.frost.utils.L import com.pitchedapps.frost.web.FrostWebViewClient import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers @@ -55,9 +56,10 @@ fun WebView.jsInject(vararg injectors: InjectorContract, callback: ((Array<Strin val validInjectors = injectors.filter { it != JsActions.EMPTY } if (validInjectors.isEmpty()) return callback(emptyArray()) val observables = Array(validInjectors.size, { SingleSubject.create<String>() }) - Observable.zip<String, Array<String>>(observables.map { it.toObservable() }, { it.map { it.toString() }.toTypedArray() }).subscribeOn(AndroidSchedulers.mainThread()).subscribe({ - callback(it) - }) + L.d("Injecting ${observables.size} items") + Observable.zip<String, Array<String>>(observables.map(SingleSubject<String>::toObservable), + { it.map(Any::toString).toTypedArray() }) + .subscribeOn(AndroidSchedulers.mainThread()).subscribe({ callback(it) }) (0 until validInjectors.size).forEach { i -> validInjectors[i].inject(this, { observables[i].onSuccess(it) }) } } |