|
|
@@ -383,9 +383,13 @@ var formatText = (function() {
|
|
|
var _parent = this._parent;
|
|
|
while (_parent && !_parent.isEmoji)
|
|
|
_parent = _parent._parent;
|
|
|
- if (_parent)
|
|
|
- return opts.emojiFormatFunction(_parent.trigger +this.text +_parent.trigger);
|
|
|
- return opts.emojiFormatFunction(this.text);
|
|
|
+ if (_parent) {
|
|
|
+ var fallback = _parent.trigger +this.text +_parent.trigger;
|
|
|
+ var formatted = opts.emojiFormatFunction(fallback);
|
|
|
+ return formatted ? formatted : fallback;
|
|
|
+ }
|
|
|
+ var formatted = opts.emojiFormatFunction(this.text);
|
|
|
+ return formatted ? formatted : this.text;
|
|
|
}
|
|
|
if (this._parent.checkIsCodeBlock())
|
|
|
return this.text.replace(/\n/g, '<br/>'); // TODO syntax highlight
|
