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

Ability to display tips in the loading screen

Browse Source
This commit is contained in:
yflory
2017-03-06 17:20:09 +01:00
parent 77d09f64e1
commit d93a270336
4 changed files with 71 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
www/common/cryptpad-common.js
View File

@@ -855,6 +855,12 @@ define([
};
var LOADING = 'loading';
var getRandomTip = function () {
if (!Messages.tips || !Object.keys(Messages.tips).length) { return ''; }
var keys = Object.keys(Messages.tips);
var rdm = Math.floor(Math.random() * keys.length);
return Messages.tips[keys[rdm]];
};
common.addLoadingScreen = function (loadingText) {
if ($('#' + LOADING).length) {
$('#' + LOADING).show();
@@ -869,9 +875,24 @@ define([
$container.append($spinner).append($text);
$loading.append($container);
$('body').append($loading);
if (Messages.tips) {
var $loadingTip = $('<div>', {'id': 'loadingTip'});
var $tip = $('<span>', {'class': 'tips'}).text(getRandomTip()).appendTo($loadingTip);
console.log($('body').height());
console.log($container.height());
console.log($('body'));
console.log($container);
$loadingTip.css({
'top': $('body').height()/2 + $container.height()/2 + 20 + 'px'
});
$('body').append($loadingTip);
}
};
common.removeLoadingScreen = function (cb) {
$('#' + LOADING).fadeOut(750, cb);
window.setTimeout(function () {
$('#loadingTip').fadeOut(750);
}, 2000);
};
common.errorLoadingScreen = function (error, transparent) {
if (!$('#' + LOADING).is(':visible')) { common.addLoadingScreen(); }