From b5f0d3029836208ea820ffc283070553ed577915 Mon Sep 17 00:00:00 2001 From: damencho Date: Mon, 17 Oct 2016 17:33:30 -0500 Subject: [PATCH] Removes not used parameter of openMessageDialog (title). We pass key which is enough to obtain the title. --- conference.js | 2 +- modules/UI/UI.js | 2 -- modules/UI/recording/Recording.js | 4 ++-- modules/UI/shared_video/SharedVideo.js | 2 +- modules/UI/util/MessageHandler.js | 9 ++------- 5 files changed, 6 insertions(+), 13 deletions(-) diff --git a/conference.js b/conference.js index 9f892d642..de26abedc 100644 --- a/conference.js +++ b/conference.js @@ -195,7 +195,7 @@ function maybeRedirectToWelcomePage(showThankYou) { if (showThankYou) { APP.UI.messageHandler.openMessageDialog( - null, null, null, + null, null, APP.translation.translateString( "dialog.thankYou", {appName:interfaceConfig.APP_NAME} ) diff --git a/modules/UI/UI.js b/modules/UI/UI.js index d132e6b9f..da6b3d0d1 100644 --- a/modules/UI/UI.js +++ b/modules/UI/UI.js @@ -1219,7 +1219,6 @@ UI.showExtensionRequiredDialog = function (url) { messageHandler.openMessageDialog( "dialog.extensionRequired", null, - null, APP.translation.generateTranslationHTML( "dialog.firefoxExtensionPrompt", {url: url})); }; @@ -1397,7 +1396,6 @@ UI.showTrackNotWorkingDialog = function (stream) { "dialog.error", stream.isAudioTrack()? "dialog.micNotSendingData" : "dialog.cameraNotSendingData", - null, null); }; diff --git a/modules/UI/recording/Recording.js b/modules/UI/recording/Recording.js index 2b82c326b..f218a9f3c 100644 --- a/modules/UI/recording/Recording.js +++ b/modules/UI/recording/Recording.js @@ -365,7 +365,7 @@ var Recording = { dialog = APP.UI.messageHandler.openMessageDialog( self.recordingTitle, self.recordingBusy, - null, null, + null, function () { dialog = null; } @@ -376,7 +376,7 @@ var Recording = { dialog = APP.UI.messageHandler.openMessageDialog( self.recordingTitle, self.recordingUnavailable, - null, null, + null, function () { dialog = null; } diff --git a/modules/UI/shared_video/SharedVideo.js b/modules/UI/shared_video/SharedVideo.js index 36482e63e..c8a7a58b8 100644 --- a/modules/UI/shared_video/SharedVideo.js +++ b/modules/UI/shared_video/SharedVideo.js @@ -93,7 +93,7 @@ export default class SharedVideoManager { dialog = APP.UI.messageHandler.openMessageDialog( "dialog.shareVideoTitle", "dialog.alreadySharedVideoMsg", - null, null, + null, function () { dialog = null; } diff --git a/modules/UI/util/MessageHandler.js b/modules/UI/util/MessageHandler.js index 319a459e3..6955c16e4 100644 --- a/modules/UI/util/MessageHandler.js +++ b/modules/UI/util/MessageHandler.js @@ -31,22 +31,17 @@ var messageHandler = { * message, if a message title is not provided. * @param messageKey the key used to find the translation of the message, * if a message is not provided. - * @param title the title of the message. If a falsy value is provided, - * titleKey will be used to get a title via the translation API. * @param message the message to show. If a falsy value is provided, * messageKey will be used to get a message via the translation API. * @param closeFunction function to be called after * the prompt is closed (optional) * @return the prompt that was created, or null */ - openMessageDialog: function(titleKey, messageKey, title, message, - closeFunction) { + openMessageDialog: function(titleKey, messageKey, message, closeFunction) { if (!popupEnabled) return null; - if (!title) { - title = APP.translation.generateTranslationHTML(titleKey); - } + let title = APP.translation.generateTranslationHTML(titleKey); if (!message) { message = APP.translation.generateTranslationHTML(messageKey); }