emoji works, huzzah. addresses #681, #1840, and some discussion in #1908

This commit is contained in:
Nick Gordon
2013-11-26 21:49:53 -08:00
parent 4af9d97c33
commit 13a7292377
3 changed files with 15 additions and 5 deletions

View File

@@ -81,12 +81,18 @@ habitrpg.directive('habitrpgSortable', ['User', function(User) {
// return hljs.highlightAuto(code).value;
// }
});
emoji.img_path = 'bower_components/gemoji/images/emoji/unicode/';
var toHtml = function (markdown) {
if (markdown == undefined)
return '';
return marked(markdown);
markdown = marked(markdown);
markdown = emoji.replace_colons(markdown);
markdown = emoji.replace_unified(markdown);
return markdown;
};
// [nickgordon20131123] this hacky override wraps images with a link to the image in a new window, and also adds some classes in case we want to style
@@ -133,7 +139,7 @@ habitrpg.directive('habitrpgSortable', ['User', function(User) {
+ '></a>';
}
}
//hljs.tabReplace = ' ';
return {