diff options
author | Allan Wang <me@allanwang.ca> | 2019-09-21 18:03:23 -0700 |
---|---|---|
committer | Allan Wang <me@allanwang.ca> | 2019-09-21 18:03:23 -0700 |
commit | ae3b956497f8eb1b019752f9588b04798304c6bd (patch) | |
tree | dc63855729ef5d2b880f434d4b2d16d04ace7445 | |
parent | 96908453abbd7e40e13af4359d1bce4524b979a6 (diff) | |
download | frost-ae3b956497f8eb1b019752f9588b04798304c6bd.tar.gz frost-ae3b956497f8eb1b019752f9588b04798304c6bd.tar.bz2 frost-ae3b956497f8eb1b019752f9588b04798304c6bd.zip |
Disable click launches from notification page
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt | 5 | ||||
-rw-r--r-- | app/src/web/ts/click_a.ts | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt index 9e45d4fe..721b2c2d 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt @@ -68,6 +68,11 @@ open class FrostWebViewClient(val web: FrostWebView) : BaseWebViewClient() { private val refresh: SendChannel<Boolean> = web.parent.refreshChannel private val isMain = web.parent.baseEnum != null + override fun doUpdateVisitedHistory(view: WebView, url: String?, isReload: Boolean) { + v { "History $url" } + super.doUpdateVisitedHistory(view, url, isReload) + } + protected inline fun v(crossinline message: () -> Any?) = L.v { "web client: ${message()}" } override fun onPageStarted(view: WebView, url: String?, favicon: Bitmap?) { diff --git a/app/src/web/ts/click_a.ts b/app/src/web/ts/click_a.ts index 1fd63683..8a7cc48c 100644 --- a/app/src/web/ts/click_a.ts +++ b/app/src/web/ts/click_a.ts @@ -42,7 +42,10 @@ type EventHandler = (e: Event, target: HTMLElement) => Boolean const _frostGeneral: EventHandler = (e, target) => { - // Notifications are two layers under + // We now disable clicks for the main notification page + if (document.getElementById("notifications_list")) { + return false + } const url = _parentUrl(target, 2); return Frost.loadUrl(url); }; |