nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4353 from netom/oembed_to_mobile_view

Browse source 
Added oembed display to mobile stream view

Conflicts:
	app/views/status_messages/_status_message.mobile.haml
This commit is contained in:
Jonne Haß 2013-08-27 21:58:00 +02:00
commit 17580c123d
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -7,6 +7,7 @@ Highlight down arrow at the user menu on hover [#4441](https://github.com/diaspo
Make invite code input width consistent across borwsers [#4448](https://github.com/diaspora/diaspora/pull/4448) Make invite code input width consistent across borwsers [#4448](https://github.com/diaspora/diaspora/pull/4448)
## Features ## Features
Add oEmbed content to the mobile view [#4343](https://github.com/diaspora/diaspora/pull/4353)
# 0.2.0.0 # 0.2.0.0

1
app/views/shared/_stream_element.mobile.haml
View file

@ -10,7 +10,6 @@
| |
= link_to t('javascripts.stream.show_nsfw_post'), '#' = link_to t('javascripts.stream.show_nsfw_post'), '#'
- if post.is_a?(Reshare) - if post.is_a?(Reshare)
= render 'reshares/reshare', :reshare => post, :post => post.absolute_root = render 'reshares/reshare', :reshare => post, :post => post.absolute_root

3
app/views/status_messages/_status_message.mobile.haml
View file

@ -16,7 +16,8 @@
%div{:class => direction_for(post.text)} %div{:class => direction_for(post.text)}
!= markdownify(post) != markdownify(post)
- if post.o_embed_cache
!= o_embed_html post.o_embed_cache
-if post.open_graph_cache -if post.open_graph_cache
.opengraph .opengraph
!= og_html post.open_graph_cache != og_html post.open_graph_cache