`,
diff --git a/modules/UI/util/MessageHandler.js b/modules/UI/util/MessageHandler.js
index 3cbebc5a6..fdf274481 100644
--- a/modules/UI/util/MessageHandler.js
+++ b/modules/UI/util/MessageHandler.js
@@ -7,11 +7,18 @@ import UIUtil from './UIUtil';
* Flag for enable/disable of the notifications.
* @type {boolean}
*/
-var notificationsEnabled = true;
+let notificationsEnabled = true;
+
+/**
+ * Flag for enabling/disabling popups.
+ * @type {boolean}
+ */
+let popupEnabled = true;
+
+var messageHandler = {
+ OK: "dialog.OK",
+ CANCEL: "dialog.Cancel",
-var messageHandler = (function(my) {
- my.OK = "dialog.OK",
- my.CANCEL = "dialog.Cancel",
/**
* Shows a message to the user.
*
@@ -24,7 +31,10 @@ var messageHandler = (function(my) {
* @param message the message to show. If a falsy value is provided,
* messageKey will be used to get a message via the translation API.
*/
- my.openMessageDialog = function(titleKey, messageKey, title, message) {
+ openMessageDialog: function(titleKey, messageKey, title, message) {
+ if (!popupEnabled)
+ return;
+
if (!title) {
title = APP.translation.generateTranslationHTML(titleKey);
}
@@ -35,8 +45,7 @@ var messageHandler = (function(my) {
$.prompt(message,
{title: title, persistent: false}
);
- };
-
+ },
/**
* Shows a message to the user with two buttons: first is given as a
* parameter and the second is Cancel.
@@ -55,9 +64,13 @@ var messageHandler = (function(my) {
* @param defaultButton index of default button which will be activated when
* the user press 'enter'. Indexed from 0.
*/
- my.openTwoButtonDialog = function(titleKey, titleString, msgKey, msgString,
+ openTwoButtonDialog: function(titleKey, titleString, msgKey, msgString,
persistent, leftButtonKey, submitFunction, loadedFunction,
closeFunction, focus, defaultButton) {
+
+ if (!popupEnabled)
+ return;
+
var buttons = [];
var leftButton = APP.translation.generateTranslationHTML(leftButtonKey);
@@ -84,7 +97,7 @@ var messageHandler = (function(my) {
submit: submitFunction,
close: closeFunction
});
- };
+ },
/**
* Shows a message to the user with two buttons: first is given as a
@@ -101,8 +114,11 @@ var messageHandler = (function(my) {
* @param loadedFunction function to be called after the prompt is fully
* loaded
*/
- my.openDialog = function (titleString, msgString, persistent, buttons,
+ openDialog: function (titleString, msgString, persistent, buttons,
submitFunction, loadedFunction) {
+ if (!popupEnabled)
+ return;
+
var args = {
title: titleString,
persistent: persistent,
@@ -115,23 +131,26 @@ var messageHandler = (function(my) {
args.closeText = '';
}
return new Impromptu(msgString, args);
- };
+ },
/**
* Closes currently opened dialog.
*/
- my.closeDialog = function () {
+ closeDialog: function () {
$.prompt.close();
- };
+ },
/**
* Shows a dialog with different states to the user.
*
* @param statesObject object containing all the states of the dialog.
*/
- my.openDialogWithStates = function (statesObject, options) {
+ openDialogWithStates: function (statesObject, options) {
+ if (!popupEnabled)
+ return;
+
return new Impromptu(statesObject, options);
- };
+ },
/**
* Opens new popup window for given url centered over current
@@ -146,7 +165,10 @@ var messageHandler = (function(my) {
* @returns {object} popup window object if opened successfully or undefined
* in case we failed to open it(popup blocked)
*/
- my.openCenteredPopup = function (url, w, h, onPopupClosed) {
+ openCenteredPopup: function (url, w, h, onPopupClosed) {
+ if (!popupEnabled)
+ return;
+
var l = window.screenX + (window.innerWidth / 2) - (w / 2);
var t = window.screenY + (window.innerHeight / 2) - (h / 2);
var popup = window.open(
@@ -161,7 +183,7 @@ var messageHandler = (function(my) {
}, 200);
}
return popup;
- };
+ },
/**
* Shows a dialog prompting the user to send an error report.
@@ -170,18 +192,18 @@ var messageHandler = (function(my) {
* @param msgKey the text of the message
* @param error the error that is being reported
*/
- my.openReportDialog = function(titleKey, msgKey, error) {
- my.openMessageDialog(titleKey, msgKey);
+ openReportDialog: function(titleKey, msgKey, error) {
+ this.openMessageDialog(titleKey, msgKey);
console.log(error);
//FIXME send the error to the server
- };
+ },
/**
* Shows an error dialog to the user.
* @param titleKey the title of the message.
* @param msgKey the text of the message.
*/
- my.showError = function(titleKey, msgKey) {
+ showError: function(titleKey, msgKey) {
if (!titleKey) {
titleKey = "dialog.oops";
@@ -190,7 +212,7 @@ var messageHandler = (function(my) {
msgKey = "dialog.defaultError";
}
messageHandler.openMessageDialog(titleKey, msgKey);
- };
+ },
/**
* Displayes notification.
@@ -201,10 +223,12 @@ var messageHandler = (function(my) {
* @param messageArguments object with the arguments for the message.
* @param options object with language options.
*/
- my.notify = function(displayName, displayNameKey,
+ notify: function(displayName, displayNameKey,
cls, messageKey, messageArguments, options) {
+
if(!notificationsEnabled)
return;
+
var displayNameSpan = '', null, options);
- };
+ },
/**
* Removes the toaster.
* @param toasterElement
*/
- my.remove = function(toasterElement) {
+ remove: function(toasterElement) {
toasterElement.remove();
- };
+ },
/**
- * Disables notifications.
+ * Enables / disables notifications.
*/
- my.disableNotifications = function () {
- notificationsEnabled = false;
- };
+ enableNotifications: function (enable) {
+ notificationsEnabled = enable;
+ },
- /**
- * Enables notifications.
- */
- my.enableNotifications = function () {
- notificationsEnabled = true;
- };
-
- return my;
-}(messageHandler || {}));
+ enablePopups: function (enable) {
+ popupEnabled = enable;
+ }
+};
module.exports = messageHandler;