IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: keep scroll position when minimizing composer in iOS

Browse Source
This commit is contained in:
Penar Musaraj 2020-04-27 22:03:56 -04:00
parent ad978b93ab
commit b1d30d7f05
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/discourse/app/lib/safari-hacks.js
View File

@ -86,7 +86,7 @@ function positioningWorkaround($fixedElement) {
document.addEventListener("scroll", () => { document.addEventListener("scroll", () => {
if (!caps.isIpadOS && workaroundActive) { if (!caps.isIpadOS && workaroundActive) {
document.documentElement.scrollTop = 0; window.scrollTo(0, 0);
} }
}); });
@ -100,7 +100,8 @@ function positioningWorkaround($fixedElement) {
if (workaroundActive) { if (workaroundActive) {
$("body").removeClass("ios-safari-composer-hacks"); $("body").removeClass("ios-safari-composer-hacks");
$(window).scrollTop(originalScrollTop); window.scrollTo(0, originalScrollTop);
if (evt && evt.target) { if (evt && evt.target) {
evt.target.removeEventListener("blur", blurred); evt.target.removeEventListener("blur", blurred);
} }
@ -164,7 +165,9 @@ function positioningWorkaround($fixedElement) {
.find(".select-kit > button.is-focused") .find(".select-kit > button.is-focused")
.removeClass("is-focused"); .removeClass("is-focused");
originalScrollTop = $(window).scrollTop(); if (window.pageYOffset > 0) {
originalScrollTop = window.pageYOffset;
}
const elementRect = _this.getBoundingClientRect(); const elementRect = _this.getBoundingClientRect();
if (elementRect.top > 100) { if (elementRect.top > 100) {
@ -195,7 +198,7 @@ function positioningWorkaround($fixedElement) {
} }
$("body").addClass("ios-safari-composer-hacks"); $("body").addClass("ios-safari-composer-hacks");
$(window).scrollTop(0); window.scrollTo(0, 0);
if (!iOSWithVisualViewport()) { if (!iOSWithVisualViewport()) {
const height = calcHeight(); const height = calcHeight();