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

pull/1/head
yflory 4 years ago
commit c7353cc879

@ -470,8 +470,9 @@ define([
var noCache = false; // Prevent reload loops var noCache = false; // Prevent reload loops
var onCorruptedCache = function () { var onCorruptedCache = function () {
if (noCache) { if (noCache) {
// XXX translation key UI.errorLoadingScreen(Messages.unableToDisplay, false, function () {
return UI.errorLoadingScreen("Reload loop: empty chainpad for a non-empty channel"); common.gotoURL('');
});
} }
noCache = true; noCache = true;
var sframeChan = common.getSframeChannel(); var sframeChan = common.getSframeChannel();

@ -1395,7 +1395,8 @@ MessengerUI, Messages) {
toolbar.isErrorState = bool; // Stop kickSpinner toolbar.isErrorState = bool; // Stop kickSpinner
toolbar.title.toggleClass('cp-toolbar-unsync', bool); // "read only" next to the title toolbar.title.toggleClass('cp-toolbar-unsync', bool); // "read only" next to the title
if (bool && toolbar.spinner) { if (bool && toolbar.spinner) {
toolbar.spinner.text("OFFLINE"); // XXX Messages.offline = "OFFLINE"; // XXX
toolbar.spinner.text(Messages.offline);
} else { } else {
kickSpinner(toolbar, config); kickSpinner(toolbar, config);
} }

Loading…
Cancel
Save