From 814845e87983743fca19ec41dcdf67340a8e0f13 Mon Sep 17 00:00:00 2001 From: JC Brand Date: Sun, 21 Aug 2016 11:17:06 +0000 Subject: [PATCH] Provide a nicer notification when reconnecting after a dropped connection. --- src/converse-core.js | 5 +++-- src/converse-notification.js | 16 ++++++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/converse-core.js b/src/converse-core.js index 6c0be897e..40c955c21 100755 --- a/src/converse-core.js +++ b/src/converse-core.js @@ -403,8 +403,9 @@ converse.connection.reconnecting = true; converse.connection.disconnect('re-connecting'); converse.connection.reset(); - converse.log('Attempting to reconnect'); - converse.giveFeedback(__('Attempting to reconnect'), 'error'); + converse.log('The connection has dropped, attempting to reconnect.'); + converse.giveFeedback( + __('The connection has dropped, attempting to reconnect.'), 'warn'); converse.clearSession(); converse._tearDown(); if (converse.authentication !== "prebind") { diff --git a/src/converse-notification.js b/src/converse-notification.js index 8a4a56e53..8d855f3eb 100644 --- a/src/converse-notification.js +++ b/src/converse-notification.js @@ -194,8 +194,16 @@ setTimeout(n.close.bind(n), 5000); }; - converse.showErrorNotification = function (data) { - var n = new Notification(__('An error has occured'), { + converse.showFeedbackNotification = function (data) { + var subject; + if (data.klass === 'error') { + subject = __('An error has occured'); + } else if (data.klass === 'warn') { + subject = __('Please be aware'); + } else { + return; + } + var n = new Notification(subject, { body: data.message, lang: converse.i18n.locale_data.converse[""].lang, icon: 'logo/conversejs.png' @@ -234,8 +242,8 @@ }; converse.handleFeedback = function (evt, data) { - if (data.klass === 'error' && converse.areDesktopNotificationsEnabled(true)) { - converse.showErrorNotification(data); + if (converse.areDesktopNotificationsEnabled(true)) { + converse.showFeedbackNotification(data); } };