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
Show Stats 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(); var newContentStr = cpNfInner.chainpad.getUserDoc();
if (state === STATE.DELETED) { return; } if (state === STATE.DELETED) { return; }
//UI.updateLoadingProgress({ state: -1 }, false); UI.updateLoadingProgress({ state: -1 }, false);
var newPad = false; var newPad = false;
if (newContentStr === '') { newPad = true; } if (newContentStr === '') { newPad = true; }
@ -452,9 +452,9 @@ define([
nThen(function (waitFor) { nThen(function (waitFor) {
UI.addLoadingScreen(); UI.addLoadingScreen();
SFCommon.create(waitFor(function (c) { common = c; })); SFCommon.create(waitFor(function (c) { common = c; }));
/*UI.updateLoadingProgress({ UI.updateLoadingProgress({
state: 1 state: 1
}, false);*/ }, false);
}).nThen(function (waitFor) { }).nThen(function (waitFor) {
common.getSframeChannel().onReady(waitFor()); common.getSframeChannel().onReady(waitFor());
}).nThen(function (waitFor) { }).nThen(function (waitFor) {
@ -481,14 +481,16 @@ define([
onRemote: onRemote, onRemote: onRemote,
onLocal: onLocal, onLocal: onLocal,
onInit: function () { onInit: function () {
/*UI.updateLoadingProgress({ UI.updateLoadingProgress({
state: 2 state: 2,
}, false);*/ progress: 0.1
}, false);
stateChange(STATE.INITIALIZING); stateChange(STATE.INITIALIZING);
}, },
onReady: function () { evStart.reg(onReady); }, onReady: function () { evStart.reg(onReady); },
onConnectionChange: onConnectionChange, onConnectionChange: onConnectionChange,
onError: onError onError: onError,
updateLoadingProgress: UI.updateLoadingProgress
}); });
var privReady = Util.once(waitFor()); var privReady = Util.once(waitFor());

10
www/common/sframe-chainpad-netflux-inner.js
View File

@ -45,6 +45,7 @@ define([
var readOnly = config.readOnly || false; var readOnly = config.readOnly || false;
var sframeChan = config.sframeChan; var sframeChan = config.sframeChan;
var metadataMgr = config.metadataMgr; var metadataMgr = config.metadataMgr;
var updateLoadingProgress = config.updateLoadingProgress;
config = undefined; config = undefined;
var chainpad = ChainPad.create({ var chainpad = ChainPad.create({
@ -64,6 +65,7 @@ define([
var myID; var myID;
var isReady = false; var isReady = false;
var isHistory = 1;
var evConnected = Util.mkEvent(true); var evConnected = Util.mkEvent(true);
var evInfiniteSpinner = Util.mkEvent(true); var evInfiniteSpinner = Util.mkEvent(true);
@ -114,11 +116,19 @@ define([
onLocal(true); // should be onBeforeMessage onLocal(true); // should be onBeforeMessage
} }
chainpad.message(content); chainpad.message(content);
if (isHistory && updateLoadingProgress) {
updateLoadingProgress({
state: 2,
progress: isHistory
}, false);
isHistory++;
}
cb('OK'); cb('OK');
}); });
sframeChan.on('EV_RT_READY', function () { sframeChan.on('EV_RT_READY', function () {
if (isReady) { return; } if (isReady) { return; }
isReady = true; isReady = true;
isHistory = false;
chainpad.start(); chainpad.start();
setMyID({ myID: myID }); setMyID({ myID: myID });
onReady({ realtime: chainpad }); onReady({ realtime: chainpad });