Updated: ckeditor 4.5.3, jquery 1.11.3, openpgpjs 1.2.0

OpenPGP decrypt fix
+ Small fixes
This commit is contained in:
RainLoop Team 2015-09-17 22:48:52 +03:00
parent 4deb083d7d
commit 87887373c1
370 changed files with 10805 additions and 5637 deletions

View file

@ -245,6 +245,19 @@
}, bForce);
};
AdminApp.prototype.bootend = function (callback)
{
if (progressJs)
{
progressJs.end();
}
if (callback)
{
callback();
}
};
AdminApp.prototype.bootstart = function ()
{
AbstractApp.prototype.bootstart.call(this);
@ -280,10 +293,7 @@
}
}
if (progressJs)
{
progressJs().end();
}
this.bootend();
};
module.exports = new AdminApp();

View file

@ -1305,11 +1305,19 @@
AppUser.prototype.bootend = function ()
{
kn.hideLoading();
if (progressJs)
{
progressJs().end();
kn.hideLoading();
progressJs.onbeforeend(function () {
$('.progressjs-container').hide().remove();
});
progressJs.set(100).end();
}
else
{
kn.hideLoading();
}
};
@ -1336,7 +1344,7 @@
if (progressJs)
{
progressJs().set(70);
progressJs.set(90);
}
Globals.leftPanelDisabled.subscribe(function (bValue) {
@ -1352,7 +1360,6 @@
Settings.capa(Enums.Capa.TwoFactorForce) &&
Settings.settingsGet('RequireTwoFactor'))
{
this.bootend();
this.bootstartTwoFactorScreen();
}