web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix stuck loading tip

Browse Source
This commit is contained in:
ansuz 2017-06-02 12:13:11 +02:00
parent 8f7aaecc1c
commit 767793b5ca
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
customize.dist/main.css
View File

@ -387,6 +387,8 @@
left: 0; left: 0;
right: 0; right: 0;
text-align: center; text-align: center;
transition: opacity 750ms;
transition-delay: 3000ms;
} }
@media screen and (max-height: 600px) { @media screen and (max-height: 600px) {
.cp #loadingTip { .cp #loadingTip {

3
customize.dist/src/less/loading.less
View File

@ -36,6 +36,9 @@
left: 0; left: 0;
right: 0; right: 0;
text-align: center; text-align: center;
transition: opacity 750ms;
transition-delay: 3000ms;
@media screen and (max-height: @media-medium-screen) { @media screen and (max-height: @media-medium-screen) {
display: none; display: none;
} }

9
www/common/common-interface.js
View File

@ -194,10 +194,11 @@ define([
}; };
UI.removeLoadingScreen = function (cb) { UI.removeLoadingScreen = function (cb) {
$('#' + LOADING).fadeOut(750, cb); $('#' + LOADING).fadeOut(750, cb);
$('#loadingTip').css('top', ''); $('#loadingTip').css('top', '')
window.setTimeout(function () { // loading.less sets transition-delay: $wait-time
$('#loadingTip').fadeOut(750); // and transition: opacity $fadeout-time
}, 3000); .css('opacity', 0);
// jquery.fadeout can get stuck
}; };
UI.errorLoadingScreen = function (error, transparent) { UI.errorLoadingScreen = function (error, transparent) {
if (!$('#' + LOADING).is(':visible')) { UI.addLoadingScreen(undefined, true); } if (!$('#' + LOADING).is(':visible')) { UI.addLoadingScreen(undefined, true); }