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

Remove connection lost popup when websocket connection is lost

Browse Source
This commit is contained in:
yflory 2018-03-07 16:48:49 +01:00
parent 6a7c86aee7
commit f45023ed1f
7 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
customize.dist/translations/messages.fr.js
View File

@ -47,7 +47,7 @@ define(function () {
out.disconnected = 'Déconnecté'; out.disconnected = 'Déconnecté';
out.synchronizing = 'Synchronisation'; out.synchronizing = 'Synchronisation';
out.reconnecting = 'Reconnexion...'; out.reconnecting = 'Reconnexion';
out.typing = "Édition"; out.typing = "Édition";
out.initializing = "Initialisation..."; out.initializing = "Initialisation...";
out.forgotten = 'Déplacé vers la corbeille'; out.forgotten = 'Déplacé vers la corbeille';
@ -361,7 +361,7 @@ define(function () {
out.fm_templateName = "Modèles"; out.fm_templateName = "Modèles";
out.fm_searchName = "Recherche"; out.fm_searchName = "Recherche";
out.fm_recentPadsName = "Pads récents"; out.fm_recentPadsName = "Pads récents";
out.fm_ownedPadsName = "Possédés"; out.fm_ownedPadsName = "Pads possédés";
out.fm_searchPlaceholder = "Rechercher..."; out.fm_searchPlaceholder = "Rechercher...";
out.fm_newButton = "Nouveau"; out.fm_newButton = "Nouveau";
out.fm_newButtonTitle = "Créer un nouveau pad ou un dossier, importer un fichier dans le dossier courant"; out.fm_newButtonTitle = "Créer un nouveau pad ou un dossier, importer un fichier dans le dossier courant";

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

@ -48,7 +48,7 @@ define(function () {
out.disconnected = 'Disconnected'; out.disconnected = 'Disconnected';
out.synchronizing = 'Synchronizing'; out.synchronizing = 'Synchronizing';
out.reconnecting = 'Reconnecting...'; out.reconnecting = 'Reconnecting';
out.typing = "Editing"; out.typing = "Editing";
out.initializing = "Initializing..."; out.initializing = "Initializing...";
out.forgotten = 'Moved to the trash'; out.forgotten = 'Moved to the trash';

4
www/common/sframe-app-framework.js
View File

@ -325,11 +325,11 @@ define([
var onConnectionChange = function (info) { var onConnectionChange = function (info) {
if (state === STATE.DELETED) { return; } if (state === STATE.DELETED) { return; }
stateChange(info.state ? STATE.INITIALIZING : STATE.DISCONNECTED); stateChange(info.state ? STATE.INITIALIZING : STATE.DISCONNECTED);
if (info.state) { /*if (info.state) {
UI.findOKButton().click(); UI.findOKButton().click();
} else { } else {
UI.alert(Messages.common_connectionLost, undefined, true); UI.alert(Messages.common_connectionLost, undefined, true);
} }*/
}; };
var onError = function (err) { var onError = function (err) {

7
www/common/toolbar3.js
View File

@ -1048,6 +1048,13 @@ define([
toolbar.reconnecting = function (/*userId*/) { toolbar.reconnecting = function (/*userId*/) {
toolbar.connected = false; toolbar.connected = false;
if (toolbar.spinner) { if (toolbar.spinner) {
var state = -1;
var interval = window.setInterval(function () {
if (toolbar.connected) { clearInterval(interval); }
var dots = Array(state+1).join('.');
toolbar.spinner.text(Messages.reconnecting + dots);
if (++state > 3) { state = 0; }
}, 500);
toolbar.spinner.text(Messages.reconnecting); toolbar.spinner.text(Messages.reconnecting);
} }
}; };

2
www/drive/inner.js
View File

@ -237,7 +237,7 @@ define([
'tabindex': '-1', 'tabindex': '-1',
'data-icon': faFolder, 'data-icon': faFolder,
}, Messages.fc_newfolder)), }, Messages.fc_newfolder)),
h('li', h('a.cp-app-drive-context-hashtag.dropdown-item', { h('li', h('a.cp-app-drive-context-hashtag.dropdown-item.cp-app-drive-context-editable', {
'tabindex': '-1', 'tabindex': '-1',
'data-icon': faTags, 'data-icon': faTags,
}, Messages.fc_hashtag)), }, Messages.fc_hashtag)),

4
www/poll/inner.js
View File

@ -1117,13 +1117,13 @@ define([
}); });
} }
setEditable(false); setEditable(false);
UI.alert(Messages.common_connectionLost, undefined, true); //UI.alert(Messages.common_connectionLost, undefined, true);
}; };
var onReconnect = function () { var onReconnect = function () {
if (APP.unrecoverable) { return; } if (APP.unrecoverable) { return; }
setEditable(true); setEditable(true);
UI.findOKButton().click(); //UI.findOKButton().click();
}; };
var getHeadingText = function () { var getHeadingText = function () {

4
www/whiteboard/inner.js
View File

@ -616,9 +616,9 @@ define([
setEditable(info.state); setEditable(info.state);
if (info.state) { if (info.state) {
initializing = true; initializing = true;
UI.findOKButton().click(); //UI.findOKButton().click();
} else { } else {
UI.alert(Messages.common_connectionLost, undefined, true); //UI.alert(Messages.common_connectionLost, undefined, true);
} }
}; };