From 4c6311db89f1a7267b3c72b1fb61af3bfd032091 Mon Sep 17 00:00:00 2001 From: Rory Madden Date: Tue, 28 Jan 2014 15:28:55 +0000 Subject: [PATCH 1/3] Add variables to messages for interpolation by angular-translate --- src/growlFactory.js | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/growlFactory.js b/src/growlFactory.js index d3e5329..247dd14 100644 --- a/src/growlFactory.js +++ b/src/growlFactory.js @@ -6,6 +6,7 @@ angular.module("angular-growl").provider("growl", function() { _messagesKey = 'messages', _messageTextKey = 'text', _messageSeverityKey = 'severity', + _messageVariableKey = 'variables', _onlyUniqueMessages = true; /** @@ -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; }; @@ -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); } @@ -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); @@ -180,7 +191,12 @@ angular.module("angular-growl").provider("growl", function() { severity = "error"; break; } - sendMessage(message[_messageTextKey], undefined, severity); + + var config = {}; + // were any variables included + config.variables = message[_messageVariableKey] || {}; + + sendMessage(message[_messageTextKey], config, severity); } } } From 5c8eafdb169f0105c89a977fe6295f9994f8f150 Mon Sep 17 00:00:00 2001 From: Rory Madden Date: Tue, 28 Jan 2014 15:35:05 +0000 Subject: [PATCH 2/3] Default server message to error if no severity provided --- src/growlFactory.js | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/src/growlFactory.js b/src/growlFactory.js index 247dd14..5d43cc0 100644 --- a/src/growlFactory.js +++ b/src/growlFactory.js @@ -176,20 +176,27 @@ 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'; } var config = {}; From d66837deac9a1b00ccad01a51f59f8aa3e5a21c6 Mon Sep 17 00:00:00 2001 From: Rory Madden Date: Tue, 28 Jan 2014 16:02:12 +0000 Subject: [PATCH 3/3] Revert "Add variables to messages for interpolation by angular-translate" This reverts commit 4c6311db89f1a7267b3c72b1fb61af3bfd032091. --- src/growlFactory.js | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/src/growlFactory.js b/src/growlFactory.js index 5d43cc0..7bceb51 100644 --- a/src/growlFactory.js +++ b/src/growlFactory.js @@ -6,7 +6,6 @@ angular.module("angular-growl").provider("growl", function() { _messagesKey = 'messages', _messageTextKey = 'text', _messageSeverityKey = 'severity', - _messageVariableKey = 'variables', _onlyUniqueMessages = true; /** @@ -55,15 +54,6 @@ 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; }; @@ -106,7 +96,7 @@ angular.module("angular-growl").provider("growl", function() { function broadcastMessage(message) { if (translate) { - message.text = translate(message.text, message.variables); + message.text = translate(message.text); } $rootScope.$broadcast("growlMessage", message); } @@ -118,8 +108,7 @@ angular.module("angular-growl").provider("growl", function() { text: text, severity: severity, ttl: _config.ttl || _ttl, - enableHtml: _config.enableHtml || _enableHtml, - variables: _config.variables || {} + enableHtml: _config.enableHtml || _enableHtml }; broadcastMessage(message); @@ -198,12 +187,7 @@ angular.module("angular-growl").provider("growl", function() { else { severity = 'error'; } - - var config = {}; - // were any variables included - config.variables = message[_messageVariableKey] || {}; - - sendMessage(message[_messageTextKey], config, severity); + sendMessage(message[_messageTextKey], undefined, severity); } } }