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

Merge branch 'infiniteSpinner' into fileManagerMerge

pull/1/head
yflory 2016-12-08 16:03:18 +01:00
parent 5cd7d8ec84 05fd6c1563
commit 43ccd11adc
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);
editor.on('change', onLocal);

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

@ -589,6 +589,7 @@ define([
$(function() {
// 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"
Alertify.reset();
if($('#pad-iframe').length) {
var $iframe = $('#pad-iframe');
@ -875,6 +876,7 @@ define([
var styleAlerts = common.styleAlerts = function (href) {
var $link = $('link[href="/customize/alertify.css"]');
if ($link.length) {
return;
$link.attr('href', '');
$link.attr('href', '/customize/alertify.css');
return;

5
www/common/toolbar.js
View File

@ -313,12 +313,11 @@ define([
}
}
else if (!firstConnection) {
lagErrors++;
// Display the red light at the 2nd failed attemp to get the lag
if (lagErrors > 1) {
//if (lagErrors > 1) {
lagLight.addClass('lag-red');
title = Messages.redLight;
}
//}
}
if (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 () {
if (initializing) { 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);
editor.on('change', onLocal);