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

Merge pull request #3012 from Raven24/oembed-fixes

Browse source 
small fixes for oembed in posts [ci skip]
This commit is contained in:
Maxwell Salzberg 2012-03-19 19:03:26 -07:00
commit e0c71e13de
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
public/javascripts/app/views/content_view.js
View file

@ -3,7 +3,7 @@ app.views.Content = app.views.StreamObject.extend({
events: { events: {
"click .oembed .thumb": "showOembedContent" "click .oembed .thumb": "showOembedContent"
}, },
presenter : function(){ presenter : function(){
return _.extend(this.defaultPresenter(), { return _.extend(this.defaultPresenter(), {
text : app.helpers.textFormatter(this.model), text : app.helpers.textFormatter(this.model),
@ -37,10 +37,10 @@ app.views.Content = app.views.StreamObject.extend({
showOembedContent: function() { showOembedContent: function() {
var oembed = $(this.el).find(".oembed"); var oembed = $(this.el).find(".oembed");
var embedHTML = $( this.embedHTML() ); var insertHTML = $( this.embedHTML() );
var paramSeparator = ( /\\?/.test(embedHTML.attr("href")) ) ? "&" : "?"; var paramSeparator = ( /\?/.test(insertHTML.attr("src")) ) ? "&" : "?";
embedHTML.attr("src", embedHTML.attr("src") + paramSeparator + "autoplay=1"); insertHTML.attr("src", insertHTML.attr("src") + paramSeparator + "autoplay=1");
oembed.html( embedHTML ); oembed.html( insertHTML );
} }
}); });

1
public/stylesheets/sass/application.sass
View file

@ -1830,6 +1830,7 @@ ul#press_logos
.collapsible .collapsible
.oembed .oembed
:background url('/images/ajax-loader2.gif') no-repeat center center :background url('/images/ajax-loader2.gif') no-repeat center center
:display inline-block
.thumb .thumb
:position relative :position relative