Merge branch 'soon' into fileManager

This commit is contained in:
yflory committed 2017-01-10 15:07:48 +01:00
commit 4278ac7637
17 files changed
+207 -104

No files matched your search

+2 -2
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();