fix conflicts 1

joomla · Jun 15, 2016 · 086125a · 086125a
1 parent a90a531
commit 086125a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 20 deletions.
diff --git a/media/system/js/sendtestmail-uncompressed.js b/media/system/js/sendtestmail-uncompressed.js
@@ -69,31 +69,34 @@ jQuery(document).ready(function ($)
 		.done(function (response) {
 			var msg = {};
 
-			if (typeof response.messages == 'object')
+			if (response.data)
 			{
-				if (response.data && typeof response.messages.success != 'undefined' && response.messages.success.length > 0)
+				if (typeof response.messages == 'object')
 				{
-					msg.success = [response.messages.success];
+					if (typeof response.messages.success != 'undefined' && response.messages.success.length > 0)
+					{
+						msg.message = [response.messages.success];
+					}
 				}
-
-				if (typeof response.messages.error != 'undefined' && response.messages.error.length > 0)
-				{
-					msg.error = [response.messages.error];
-				}
-
-				if (typeof response.messages.warning != 'undefined' && response.messages.warning.length > 0)
+			}
+			else
+			{
+				if (typeof response.messages == 'object')
 				{
-					msg.warning = [response.messages.warning];
-				}
+					if (typeof response.messages.error != 'undefined' && response.messages.error.length > 0)
+					{
+						msg.error = [response.messages.error];
+					}
 
-				if (typeof response.messages.notice != 'undefined' && response.messages.notice.length > 0)
-				{
-					msg.notice = [response.messages.notice];
-				}
+					if (typeof response.messages.notice != 'undefined' && response.messages.notice.length > 0)
+					{
+						msg.notice = [response.messages.notice];
+					}
 
-				if (typeof response.messages.message != 'undefined' && response.messages.message.length > 0)
-				{
-					msg.message = [response.messages.message];
+					if (typeof response.messages.message != 'undefined' && response.messages.message.length > 0)
+					{
+						msg.message = [response.messages.message];
+					}
 				}
 			}
 

diff --git a/media/system/js/sendtestmail.js b/media/system/js/sendtestmail.js