diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/Buttons.hx | 32 | ||||
| -rw-r--r-- | src/client/Player.hx | 6 |
2 files changed, 30 insertions, 8 deletions
diff --git a/src/client/Buttons.hx b/src/client/Buttons.hx index b11e3fd..902da1b 100644 --- a/src/client/Buttons.hx +++ b/src/client/Buttons.hx @@ -8,6 +8,7 @@ import js.html.Element; import js.html.ImageElement; import js.html.InputElement; import js.html.KeyboardEvent; +import js.html.VisualViewport; using StringTools; @@ -288,9 +289,7 @@ class Buttons { window.onkeydown = function(e:KeyboardEvent) { if (!settings.hotkeysEnabled) return; final target:Element = cast e.target; - if (target.isContentEditable) return; - final tagName = target.tagName; - if (tagName == "INPUT" || tagName == "TEXTAREA") return; + if (isElementEditable(target)) return; final key:KeyCode = cast e.keyCode; if (key == Backspace) e.preventDefault(); if (!e.altKey) return; @@ -320,6 +319,14 @@ class Buttons { } } + static function isElementEditable(target:Element):Bool { + if (target == null) return false; + if (target.isContentEditable) return true; + final tagName = target.tagName; + if (tagName == "INPUT" || tagName == "TEXTAREA") return true; + return false; + } + static function updateSynchThresholdBtn():Void { final text = Lang.get("synchThreshold"); final secs = settings.synchThreshold; @@ -354,22 +361,31 @@ class Buttons { document.ontouchmove = e -> { e.preventDefault(); } + document.body.style.height = "-webkit-fill-available"; ge("#chat").style.height = "-webkit-fill-available"; } final chatline:InputElement = cast ge("#chatline"); chatline.onfocus = e -> { if (Utils.isIOS()) { - var startY = window.scrollY; + final startY = window.scrollY; Timer.delay(() -> { window.scrollBy(0, -(window.scrollY - startY)); - ge("#chat").style.height = '${window.innerHeight}px'; ge("#video").scrollTop = 0; main.scrollChatToEnd(); + if (getVisualViewport() == null) { // ios < 13 + ge("#chat").style.height = '${window.innerHeight}px'; + } }, 100); } else if (Utils.isTouch()) main.scrollChatToEnd(); } + if (Utils.isIOS() && getVisualViewport() != null) { + final viewport = getVisualViewport(); + viewport.addEventListener("resize", e -> { + ge("#chat").style.height = '${window.innerHeight}px'; + }); + } chatline.onblur = e -> { - if (Utils.isIOS()) { + if (Utils.isIOS() && getVisualViewport() == null) { // ios < 13 ge("#chat").style.height = "-webkit-fill-available"; } } @@ -387,6 +403,10 @@ class Buttons { }); } + static inline function getVisualViewport():Null<VisualViewport> { + return (window : Dynamic).visualViewport; + } + static function initPageFullscreen():Void { document.onfullscreenchange = e -> { final el = document.documentElement; diff --git a/src/client/Player.hx b/src/client/Player.hx index 7dbe018..b9de8cb 100644 --- a/src/client/Player.hx +++ b/src/client/Player.hx @@ -175,7 +175,8 @@ class Player { time: getTime() } }); - if (main.hasLeaderOnPauseRequest()) { + final hasAutoPause = main.hasLeaderOnPauseRequest() && items.length > 0; + if (hasAutoPause) { // do not remove leader if user cannot request it back final group:Client.ClientGroup = main.isAdmin() ? Admin : User; if (main.hasPermission(group, RequestLeaderPerm)) main.toggleLeader(); @@ -183,7 +184,8 @@ class Player { } public function onPause():Void { - final hasAutoPause = main.hasLeaderOnPauseRequest() && getTime() != 0; + final hasAutoPause = main.hasLeaderOnPauseRequest() && items.length > 0 + && getTime() != 0; if (hasAutoPause && !main.hasLeader()) { JsApi.once(SetLeader, event -> { final name = event.setLeader.clientName; |