always loading....

This commit is contained in:
life
2017-11-29 10:58:09 +08:00
parent 2840598cf1
commit 34c63773b3
2 changed files with 15 additions and 8 deletions

View File

@@ -1 +1 @@
{"version":"2.5","updatedTime":"2017-05-17T07:21:51.505Z"}
{"version":"2.5.2","updatedTime":"2017-11-29T07:21:51.505Z"}

View File

@@ -1313,6 +1313,11 @@ var State = {
// 先隐藏, 再resize, 再显示
// $('body').hide();
// 延迟, 让body先隐藏, 效果先显示出来
function showBody() {
$('body').removeClass('init');
$("#mainMask").html("");
$("#mainMask").hide(0);
}
setTimeout(function() {
if (isMac()) {
if (/login/.test(location.href)) {
@@ -1321,12 +1326,10 @@ var State = {
win.center();
}
}
setTimeout(function() {
// $('body').show();
$('body').removeClass('init');
$("#mainMask").html("");
$("#mainMask").hide(0);
}, 100);
showBody();
// setTimeout(function() {
// showBody();
// }, 100);
});
// end
// 打开时,同步一下
@@ -1378,7 +1381,6 @@ var State = {
}
this.recoverAfter(initedCallback);
}
};
@@ -2082,6 +2084,11 @@ function userMenu(allUsers) {
if (isMac() || debug) {
setMacTopMenu();
}
if (debug) {
setTimeout(function () {
gui.win.toggleDevTools();
}, 3000)
}
//-------------------
// 右键菜单