Prevent XHTML parsing when XHTML is not enabled.

When XHTML is not explicitly enabled, there's no point in parsing the
XHTML content of a message.

1 files changed, 6 insertions, 4 deletions

diff --git a/src/core/event.js b/src/core/event.js
index 9486ede..a2eb12c 100644
--- a/src/core/event.js
+++ b/src/core/event.js
@@ -852,10 +852,12 @@ Candy.Core.Event = (function(self, Strophe, $) {
 						}
 					}
 
-					var xhtmlChild = msg.children('html[xmlns="' + Strophe.NS.XHTML_IM + '"]');
-					if(xhtmlChild.length > 0) {
-						var xhtmlMessage = $($('<div>').append(xhtmlChild.children('body').first().contents()).html());
-						message.xhtmlMessage = xhtmlMessage;
+					if ( Candy.View.getOptions().enableXHTML === true ) {
+						var xhtmlChild = msg.children('html[xmlns="' + Strophe.NS.XHTML_IM + '"]');
+						if(xhtmlChild.length > 0) {
+							var xhtmlMessage = $($('<div>').append(xhtmlChild.children('body').first().contents()).html());
+							message.xhtmlMessage = xhtmlMessage;
+						}
 					}
 
 					self.Jabber.Room._checkForChatStateNotification(msg, roomJid, name);