summaryrefslogtreecommitdiffstats
path: root/ui/src
diff options
context:
space:
mode:
authorDessalines <tyhou13@gmx.com>2019-06-01 11:58:14 -0700
committerDessalines <tyhou13@gmx.com>2019-06-01 11:58:14 -0700
commit9cb10f7258ece889262f30ff4f3d6642acbb6882 (patch)
tree47137030945aba60468268700b68b4830fd6d501 /ui/src
parente5fd7a0ac87831d196856545617dfbc1bbcf2461 (diff)
Adding emoji support
- Fixes #163 - Bad because it doubles the size of the codebase, and it breaks hot module reloading. Decide later on merge.
Diffstat (limited to 'ui/src')
-rw-r--r--ui/src/index.html5
-rw-r--r--ui/src/utils.ts3
2 files changed, 5 insertions, 3 deletions
diff --git a/ui/src/index.html b/ui/src/index.html
index ae511ade..9e091211 100644
--- a/ui/src/index.html
+++ b/ui/src/index.html
@@ -7,8 +7,9 @@
<link rel="shortcut icon" type="image/svg+xml" href="/static/assets/favicon.svg" />
<link rel="apple-touch-icon" href="/static/assets/apple-touch-icon.png" />
<title>Lemmy</title>
- <link rel="stylesheet" href="/static/assets/libs/balloon-css/balloon.min.css">
- <script src="/static/assets/libs/sortable/sortable.min.js"></script>
+ <link rel="stylesheet" href="/static/assets/libs/balloon-css/balloon.min.css" type="text/css">
+ <script src="/static/assets/libs/sortable/sortable.min.js" type="text/javascript"></script>
+ <script src="/static/assets/libs/markdown-it-emoji/markdown-it-emoji.min.js" type="text/javascript"></script>
</head>
<body>
diff --git a/ui/src/utils.ts b/ui/src/utils.ts
index d0c7c89a..53d630ce 100644
--- a/ui/src/utils.ts
+++ b/ui/src/utils.ts
@@ -1,5 +1,6 @@
import { UserOperation, Comment, User, SortType, ListingType } from './interfaces';
import * as markdown_it from 'markdown-it';
+declare var markdownitEmoji: any;
import * as markdown_it_container from 'markdown-it-container';
export let repoUrl = 'https://github.com/dessalines/lemmy';
@@ -30,7 +31,7 @@ var md = new markdown_it({
return '</details>\n';
}
}
-});
+}).use(markdownitEmoji);
export function hotRank(comment: Comment): number {
// Rank = ScaleFactor * sign(Score) * log(1 + abs(Score)) / (Time + 2)^Gravity