diff options
| author | Allan Wang <me@allanwang.ca> | 2019-09-28 23:42:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-28 23:42:01 -0700 |
| commit | 58309cfd62ed26f3cf5d2b1cb933f50078937a3a (patch) | |
| tree | 4d137549e34a1b5c35202543a8deb7054f8f977c | |
| parent | 9b32e6c884797985e72deb18c05ea3d434a966ac (diff) | |
| parent | 8c9d1df82f31b7eca5fd383bf51c8634fa0696ee (diff) | |
| download | frost-58309cfd62ed26f3cf5d2b1cb933f50078937a3a.tar.gz frost-58309cfd62ed26f3cf5d2b1cb933f50078937a3a.tar.bz2 frost-58309cfd62ed26f3cf5d2b1cb933f50078937a3a.zip | |
Merge branch 'dev' into desktop-url-convert
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt | 5 | ||||
| -rw-r--r-- | app/src/main/res/xml/frost_changelog.xml | 1 | ||||
| -rw-r--r-- | app/src/web/ts/click_a.ts | 5 |
3 files changed, 10 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 add643c5..a7e642b1 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt @@ -70,6 +70,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/main/res/xml/frost_changelog.xml b/app/src/main/res/xml/frost_changelog.xml index fbafce76..6bf5112f 100644 --- a/app/src/main/res/xml/frost_changelog.xml +++ b/app/src/main/res/xml/frost_changelog.xml @@ -8,6 +8,7 @@ <version title="v2.4.1" /> <item text="Add better support for mobile url conversions" /> + <item text="Notification tab will keep first page in the same window; fixes marking notifications as read" /> <item text="" /> <item text="" /> <item text="" /> 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); }; |