Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/candy-chat/candy.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordaniellim2000 <daniellimweesoong@hotmail.my>2016-12-14 22:55:50 +0300
committerBen Langfeld <blangfeld@powerhrg.com>2016-12-14 22:57:19 +0300
commit53b0cbbe27409650483674b98250ce5b9a793a11 (patch)
treeea64f4030af811afc9e97f8d2269215c171c6abf
parentb8d15b7a9d6ffb181b1bfbe72a106546cb1c6910 (diff)
Fixed double parsing of Candy-generated messages as XHTML (#492)
* Fixed double parsing of Candy-generated messages as XHTML * Added embarassing missing semicolon * Fixed indentation * Puts back a mistakenly removed line
-rw-r--r--src/util.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/util.js b/src/util.js
index ed4d1c4..f85c705 100644
--- a/src/util.js
+++ b/src/util.js
@@ -104,7 +104,11 @@ Candy.Util = (function(self, $){
* (Integer) len - Max text length
*/
self.parseAndCropXhtml = function(str, len) {
- return $('<div/>').append(self.createHtml($(str).get(0), len)).html();
+ var msg = str;
+ if ( typeof str !== 'string' ) {
+ msg = self.createHtml($(str).get(0), len);
+ }
+ return $("<div/>").append(msg).html();
};
/** Function: setCookie