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

Merge branch 'soon' into fileManager

Browse Source
This commit is contained in:
yflory
2017-01-10 15:07:48 +01:00
parent 2be5db9540 63b9d4e9fd
commit 4278ac7637
17 changed files with 207 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -686,8 +686,8 @@ define([
$loading.append($container);
$('body').append($loading);
};
common.removeLoadingScreen = function () {
$('#' + LOADING).fadeOut(750);
common.removeLoadingScreen = function (cb) {
$('#' + LOADING).fadeOut(750, cb);
};
common.errorLoadingScreen = function (error) {
$('.spinnerContainer').hide();