about summary refs log tree commit diff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-12-18 15:20:39 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-12-18 15:20:39 +0100
commitaed25932b528f16861c4e016cbeb7a3de6231fe7 (patch)
tree08da19d028a3b238ecd472ff65ab4092a1e4c454 /app/assets/javascripts
parent6de079a5af328d26d7cbc8daf3367d16c311fddb (diff)
Add OEmbed iframe HTML, convert emojis on public pages, increase size of attachment thumbnails
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/application_public.js1
-rw-r--r--app/assets/javascripts/extras.jsx8
2 files changed, 9 insertions, 0 deletions
diff --git a/app/assets/javascripts/application_public.js b/app/assets/javascripts/application_public.js
index 31a96fd2d..f131a267a 100644
--- a/app/assets/javascripts/application_public.js
+++ b/app/assets/javascripts/application_public.js
@@ -1,2 +1,3 @@
 //= require jquery
 //= require jquery_ujs
+//= require extras
diff --git a/app/assets/javascripts/extras.jsx b/app/assets/javascripts/extras.jsx
new file mode 100644
index 000000000..93f827044
--- /dev/null
+++ b/app/assets/javascripts/extras.jsx
@@ -0,0 +1,8 @@
+import emojify from './components/emoji'
+
+$(() => {
+  $.each($('.entry .content, .name, .account__header__content'), (_, content) => {
+    const $content = $(content);
+    $content.html(emojify($content.html()));
+  });
+});