diff options
author | daniellim2000 <daniellimweesoong@hotmail.my> | 2016-12-14 22:55:50 +0300 |
---|---|---|
committer | Ben Langfeld <ben@langfeld.me> | 2016-12-14 22:55:50 +0300 |
commit | cfdbbb106040afa990a2d1b5829e222225a8e106 (patch) | |
tree | 54bfadec0292a3f36e29db55ff2fae25c3ec83c8 | |
parent | cbf6356cd42160d8320e7a4c7a0958457feef047 (diff) |
Fixed double parsing of Candy-generated messages as XHTML (#492)dev
* 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.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/util.js b/src/util.js index dfcf613..bc8ec40 100644 --- a/src/util.js +++ b/src/util.js @@ -110,7 +110,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 |