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

Fix UI issues in the loading screen with the loading bar

Browse Source
This commit is contained in:
yflory
2018-05-14 14:02:46 +02:00
parent 4d5606e757
commit 6fde15247b
6 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -603,13 +603,13 @@ define([
$loading.css('display', '');
$loading.removeClass('cp-loading-hidden');
$('.cp-loading-spinner-container').show();
if (config.progress && !$loading.find('.cp-loading-progress').length) {
if (!config.noProgress && !$loading.find('.cp-loading-progress').length) {
var progress = h('div.cp-loading-progress', [
h('p.cp-loading-progress-drive'),
h('p.cp-loading-progress-pad')
]);
$loading.find('.cp-loading-container').append(progress);
} else if (!config.progress) {
} else if (config.noProgress) {
$loading.find('.cp-loading-progress').remove();
}
if (loadingText) {

12
www/common/sframe-app-framework.js
View File

@@ -279,7 +279,7 @@ define([
var newContentStr = cpNfInner.chainpad.getUserDoc();
if (state === STATE.DELETED) { return; }
UI.updateLoadingProgress({ state: -1 }, false);
//UI.updateLoadingProgress({ state: -1 }, false);
var newPad = false;
if (newContentStr === '') { newPad = true; }
@@ -431,11 +431,11 @@ define([
};
nThen(function (waitFor) {
UI.addLoadingScreen({progress: true});
UI.addLoadingScreen();
SFCommon.create(waitFor(function (c) { common = c; }));
UI.updateLoadingProgress({
/*UI.updateLoadingProgress({
state: 1
}, false);
}, false);*/
}).nThen(function (waitFor) {
common.getSframeChannel().onReady(waitFor());
}).nThen(function (waitFor) {
@@ -462,9 +462,9 @@ define([
onRemote: onRemote,
onLocal: onLocal,
onInit: function () {
UI.updateLoadingProgress({
/*UI.updateLoadingProgress({
state: 2
}, false);
}, false);*/
stateChange(STATE.INITIALIZING);
},
onReady: function () { evStart.reg(onReady); },