about summary refs log tree commit diff
path: root/app/views/api/oembed
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/views/api/oembed
parent6de079a5af328d26d7cbc8daf3367d16c311fddb (diff)
Add OEmbed iframe HTML, convert emojis on public pages, increase size of attachment thumbnails
Diffstat (limited to 'app/views/api/oembed')
-rw-r--r--app/views/api/oembed/show.json.rabl4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/api/oembed/show.json.rabl b/app/views/api/oembed/show.json.rabl
index e035bc13c..2bec9165e 100644
--- a/app/views/api/oembed/show.json.rabl
+++ b/app/views/api/oembed/show.json.rabl
@@ -9,6 +9,6 @@ node(:author_url) { |entry| account_url(entry.account) }
 node(:provider_name) { Rails.configuration.x.local_domain }
 node(:provider_url) { root_url }
 node(:cache_age) { 86_400 }
-node(:html, &:content)
+node(:html) { |entry| "<div style=\"position: relative; height: 0; overflow: hidden; padding-top: 30px; padding-bottom: 56.25%\"><iframe src=\"#{embed_account_stream_entry_url(entry.account, entry)}\" style=\"position: absolute; top: 0; left: 0; width: 100%; height: 100%; overflow: hidden\" frameborder=\"0\" width=\"#{@width}\" scrolling=\"no\"></iframe></div>" }
 node(:width) { @width }
-node(:height) { @height }
+node(:height) { nil }