Skip to content
This repository was archived by the owner on Apr 13, 2025. It is now read-only.
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 40 additions & 17 deletions src/growlFactory.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ angular.module("angular-growl").provider("growl", function() {
_messagesKey = 'messages',
_messageTextKey = 'text',
_messageSeverityKey = 'severity',
_messageVariableKey = 'variables',
_onlyUniqueMessages = true;

/**
Expand Down Expand Up @@ -54,6 +55,15 @@ angular.module("angular-growl").provider("growl", function() {
_messageSeverityKey = messageSeverityKey;
};

/**
* sets the key in server sent messages the serverMessagesInterecptor is looking for variables to inject in the message
*
* @param {string} messageVariableKey default: variables
*/
this.messageVariableKey = function (messageVariableKey) {
_messageVariableKey = messageVariableKey;
};

this.onlyUniqueMessages = function(onlyUniqueMessages) {
_onlyUniqueMessages = onlyUniqueMessages;
};
Expand Down Expand Up @@ -96,7 +106,7 @@ angular.module("angular-growl").provider("growl", function() {

function broadcastMessage(message) {
if (translate) {
message.text = translate(message.text);
message.text = translate(message.text, message.variables);
}
$rootScope.$broadcast("growlMessage", message);
}
Expand All @@ -108,7 +118,8 @@ angular.module("angular-growl").provider("growl", function() {
text: text,
severity: severity,
ttl: _config.ttl || _ttl,
enableHtml: _config.enableHtml || _enableHtml
enableHtml: _config.enableHtml || _enableHtml,
variables: _config.variables || {}
};

broadcastMessage(message);
Expand Down Expand Up @@ -165,22 +176,34 @@ angular.module("angular-growl").provider("growl", function() {
for (i = 0; i < length; i++) {
message = messages[i];

if (message[_messageTextKey] && message[_messageSeverityKey]) {
switch (message[_messageSeverityKey]) {
case "warn":
severity = "warn";
break;
case "success":
severity = "success";
break;
case "info":
severity = "info";
break;
case "error":
severity = "error";
break;

if (message[_messageTextKey]) {
if (message[_messageSeverityKey]) {
switch (message[_messageSeverityKey]) {
case "warn":
severity = "warn";
break;
case "success":
severity = "success";
break;
case "info":
severity = "info";
break;
case "error":
severity = "error";
break;
}
}
// default the severity to error if no severity is provided
else {
severity = 'error';
}
sendMessage(message[_messageTextKey], undefined, severity);

var config = {};
// were any variables included
config.variables = message[_messageVariableKey] || {};

sendMessage(message[_messageTextKey], config, severity);
}
}
}
Expand Down