infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Fix the infinite spinner bug with the file manager store

pull/1/head
yflory 2016-12-08 18:52:36 +01:00
parent 43ccd11adc
commit ee56f5608f
7 changed files with 61 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
customize.dist/fsStore.js
View File

@ -153,8 +153,15 @@ define([
}
onReady(f, rt.proxy, Cryptpad.storageKey);
})
.on('disconnect', function () {
.on('disconnect', function (info) {
//setEditable(false);
if (info.error) {
//Cryptpad.alert(Messages.websocketError);
if (typeof Cryptpad.storeError === "function") {
Cryptpad.storeError();
}
return;
}
Cryptpad.alert(Messages.common_connectionLost);
});

1
customize.dist/translations/messages.js
View File

@ -21,6 +21,7 @@ define(function () {
].join('');
out.common_connectionLost = 'Server Connection Lost';
out.websocketError = 'Unable to connect to the websocket server...';
out.disconnected = 'Disconnected';
out.synchronizing = 'Synchronizing';

15
www/code/main.js
View File

@ -42,6 +42,11 @@ define([
secret.keys = secret.key;
}
var onConnectError = function (info) {
module.spinner.hide();
Cryptpad.alert(Messages.websocketError);
};
var andThen = function (CMeditor) {
var CodeMirror = module.CodeMirror = CMeditor;
CodeMirror.modeURL = "/bower_components/codemirror/mode/%N/%N.js";
@ -687,10 +692,7 @@ define([
}
};
var onError = config.onError = function (info) {
module.spinner.hide();
Cryptpad.alert(Messages.websocketError);
};
var onError = config.onError = onConnectError();
var realtime = module.realtime = Realtime.start(config);
@ -704,6 +706,11 @@ define([
// TODO handle error
andThen(CM);
});
Cryptpad.onError(function (info) {
if (info && info.type === "store") {
onConnectError();
}
});
};
var first = function () {

17
www/common/cryptpad-common.js
View File

@ -649,6 +649,19 @@ define([
}, common);
};
var errorHandlers = [];
common.onError = function (h) {
if (typeof h !== "function") { return; }
errorHandlers.push(h);
};
common.storeError = function () {
errorHandlers.forEach(function (h) {
if (typeof h === "function") {
h({type: "store"});
}
});
};
/*
* Saving files
*/
@ -877,9 +890,9 @@ define([
var $link = $('link[href="/customize/alertify.css"]');
if ($link.length) {
return;
$link.attr('href', '');
/*$link.attr('href', '');
$link.attr('href', '/customize/alertify.css');
return;
return;*/
}
href = href || '/customize/alertify.css';

15
www/pad/main.js
View File

@ -77,6 +77,11 @@ define([
return hj;
};
var onConnectError = function (info) {
module.spinner.hide();
Cryptpad.alert(Messages.websocketError);
};
var andThen = function (Ckeditor) {
var secret = Cryptpad.getSecrets();
var readOnly = secret.keys && !secret.keys.editKeyStr;
@ -691,10 +696,7 @@ define([
}
};
var onError = realtimeOptions.onError = function (info) {
module.spinner.hide();
Cryptpad.alert(Messages.websocketError);
};
var onError = realtimeOptions.onError = onConnectError;
var onLocal = realtimeOptions.onLocal = function () {
if (initializing) { return; }
@ -741,6 +743,11 @@ define([
// TODO handle error
andThen(Ckeditor);
});
Cryptpad.onError(function (info) {
if (info && info.type === "store") {
onConnectError();
}
});
};
var first = function () {

4
www/poll/test/main.js
View File

@ -662,6 +662,10 @@ define([
var disconnect = function () {
//setEditable(false); // TODO
if (info.error) {
Cryptpad.alert(Messages.websocketError);
return;
}
//Cryptpad.alert(Messages.common_connectionLost); // TODO
};

15
www/slide/main.js
View File

@ -59,6 +59,11 @@ define([
var presentMode = Slide.isPresentURL();
var onConnectError = function (info) {
module.spinner.hide();
Cryptpad.alert(Messages.websocketError);
};
var andThen = function (CMeditor) {
var CodeMirror = module.CodeMirror = CMeditor;
CodeMirror.modeURL = "/bower_components/codemirror/mode/%N/%N.js";
@ -786,10 +791,7 @@ define([
}
};
var onError = config.onError = function (info) {
module.spinner.hide();
Cryptpad.alert(Messages.websocketError);
};
var onError = config.onError = onConnectError;
var realtime = module.realtime = Realtime.start(config);
@ -803,6 +805,11 @@ define([
// TODO handle error
andThen(CM);
});
Cryptpad.onError(function (info) {
if (info && info.type === "store") {
onConnectError();
}
});
};
var first = function () {