YunoHost/yunohost-admin
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost-admin.git synced 2024-09-03 20:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

[fix] also handle flash resize case inferior to animation time

Browse source
This commit is contained in:
Laurent Peuch 2019-07-08 05:12:24 +02:00
parent a7424d6481
commit a067e69507
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/js/yunohost/main.js
View file

@ -167,9 +167,11 @@
}); });
var before = 0; var before = 0;
var startAt = undefined;
flashMessage.hover(function() { flashMessage.hover(function() {
// hover in // hover in
before = flashMessage[0].scrollTop; before = flashMessage[0].scrollTop;
startAt = new Date();
}, function() { }, function() {
// hover out // hover out
@ -193,7 +195,10 @@
// //
// Solution: // Solution:
// - we (well, I, the lone idiot who worked on that) have // - we (well, I, the lone idiot who worked on that) have
// identified 3 situations to handle // identified 4 situations to handle
// - animation time take 0.15s, if the time between the
// hover/unhover is less that that, we consider that this is a
// user mistake and restore previous position
// - log is at BOTTOM, ther user hover, see, everything, // - log is at BOTTOM, ther user hover, see, everything,
// unhover. Here: scroll position has been moved // unhover. Here: scroll position has been moved
// "displayedPageHeight * 70%" + 30px up. We detect that and // "displayedPageHeight * 70%" + 30px up. We detect that and
@ -209,9 +214,11 @@
var flasUnfoldedHeight = (window.innerHeight * .7); var flasUnfoldedHeight = (window.innerHeight * .7);
var scrollTopMax = flashMessage[0].scrollTopMax; var scrollTopMax = flashMessage[0].scrollTopMax;
// we haven't scrolled, got back to previous position if ((new Date() - startAt) < 150) {
// the 30 here is the min-height of the flash zone flashMessage.scrollTop(before);
if ((diff + 30) == flasUnfoldedHeight) { } else if ((diff + 30) == flasUnfoldedHeight) {
// we haven't scrolled, got back to previous position
// the 30 here is the min-height of the flash zone
flashMessage.scrollTop(before); flashMessage.scrollTop(before);
} else if (after == before) { } else if (after == before) {
// don't do anything, we don't want to move // don't do anything, we don't want to move