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

Progress bar for loading a pad (framework only)

Browse Source
This commit is contained in:
yflory
2018-08-30 12:07:21 +02:00
parent 264f7dc6a1
commit 475301477f
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -288,7 +288,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; }
@@ -452,9 +452,9 @@ define([
nThen(function (waitFor) {
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) {
@@ -481,14 +481,16 @@ define([
onRemote: onRemote,
onLocal: onLocal,
onInit: function () {
/*UI.updateLoadingProgress({
state: 2
}, false);*/
UI.updateLoadingProgress({
state: 2,
progress: 0.1
}, false);
stateChange(STATE.INITIALIZING);
},
onReady: function () { evStart.reg(onReady); },
onConnectionChange: onConnectionChange,
onError: onError
onError: onError,
updateLoadingProgress: UI.updateLoadingProgress
});
var privReady = Util.once(waitFor());