Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

pull/1/head
ansuz 7 years ago
commit eac6afba24

@ -4,6 +4,7 @@
.cp-toolbar-history {
display: none;
text-align: center;
width: 100%;
* {
font: @colortheme_app-font;
}

@ -20,6 +20,7 @@
#cp-app-debug {
flex: 1;
display: flex;
min-height: 0;
}
#cp-app-debug-content {
flex: 1;

@ -39,7 +39,8 @@ define([
$: $,
AppConfig: AppConfig,
SFCommon: SFCommon,
Crypto: Crypto
Crypto: Crypto,
ApiConfig: ApiConfig
};
var toolbar;
@ -167,8 +168,8 @@ define([
console.log('onConnectionChange', info.state);
};
cpNfInner = common.startRealtime(config);
metadataMgr = cpNfInner.metadataMgr;
cpNfInner = APP.cpNfInner = common.startRealtime(config);
metadataMgr = APP.metadataMgr = cpNfInner.metadataMgr;
cpNfInner.onInfiniteSpinner(function () {
console.error('infinite spinner');

Loading…
Cancel
Save