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

Fix the infinite spinner problem

Browse Source
This commit is contained in:
yflory 2016-12-08 16:01:46 +01:00
parent 4cd9bd5534
commit 05fd6c1563
5 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
www/code/main.js
View File

@ -687,6 +687,11 @@ define([
} }
}; };
var onError = config.onError = function (info) {
module.spinner.hide();
Cryptpad.alert(Messages.websocketError);
};
var realtime = module.realtime = Realtime.start(config); var realtime = module.realtime = Realtime.start(config);
editor.on('change', onLocal); editor.on('change', onLocal);

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

@ -550,6 +550,7 @@ define([
$(function() { $(function() {
// Race condition : if document.body is undefined when alertify.js is loaded, Alertify // Race condition : if document.body is undefined when alertify.js is loaded, Alertify
// won't work. We have to reset it now to make sure it uses a correct "body" // won't work. We have to reset it now to make sure it uses a correct "body"
Alertify.reset(); Alertify.reset();
if($('#pad-iframe').length) { if($('#pad-iframe').length) {
var $iframe = $('#pad-iframe'); var $iframe = $('#pad-iframe');
@ -839,6 +840,7 @@ define([
var styleAlerts = common.styleAlerts = function (href) { var styleAlerts = common.styleAlerts = function (href) {
var $link = $('link[href="/customize/alertify.css"]'); var $link = $('link[href="/customize/alertify.css"]');
if ($link.length) { if ($link.length) {
return;
$link.attr('href', ''); $link.attr('href', '');
$link.attr('href', '/customize/alertify.css'); $link.attr('href', '/customize/alertify.css');
return; return;

5
www/common/toolbar.js
View File

@ -313,12 +313,11 @@ define([
} }
} }
else if (!firstConnection) { else if (!firstConnection) {
lagErrors++;
// Display the red light at the 2nd failed attemp to get the lag // Display the red light at the 2nd failed attemp to get the lag
if (lagErrors > 1) { //if (lagErrors > 1) {
lagLight.addClass('lag-red'); lagLight.addClass('lag-red');
title = Messages.redLight; title = Messages.redLight;
} //}
} }
if (title) { if (title) {
lagLight.attr('title', title); lagLight.attr('title', title);

5
www/pad/main.js
View File

@ -691,6 +691,11 @@ define([
} }
}; };
var onError = realtimeOptions.onError = function (info) {
module.spinner.hide();
Cryptpad.alert(Messages.websocketError);
};
var onLocal = realtimeOptions.onLocal = function () { var onLocal = realtimeOptions.onLocal = function () {
if (initializing) { return; } if (initializing) { return; }
if (readOnly) { return; } if (readOnly) { return; }

5
www/slide/main.js
View File

@ -786,6 +786,11 @@ define([
} }
}; };
var onError = config.onError = function (info) {
module.spinner.hide();
Cryptpad.alert(Messages.websocketError);
};
var realtime = module.realtime = Realtime.start(config); var realtime = module.realtime = Realtime.start(config);
editor.on('change', onLocal); editor.on('change', onLocal);