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

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Jonne Haß 2016-02-12 15:51:29 +01:00
commit e873b6cd4f
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/app/views/profile_header_view.js
View file

@ -54,7 +54,6 @@ app.views.ProfileHeader = app.views.Base.extend({
},
postRenderTemplate: function() {
var self = this;
var dropdownEl = this.$('.aspect_membership_dropdown.placeholder');
if( dropdownEl.length === 0 ) {
return;

4
app/assets/javascripts/app/views/stream_post_views.js
View file

@ -125,7 +125,7 @@ app.views.StreamPost = app.views.Post.extend({
createParticipation: function (evt) {
if(evt) { evt.preventDefault(); }
that = this;
var that = this;
$.post(Routes.postParticipation(this.model.get("id")), {}, function () {
that.model.set({participation: true});
that.render();
@ -134,7 +134,7 @@ app.views.StreamPost = app.views.Post.extend({
destroyParticipation: function (evt) {
if(evt) { evt.preventDefault(); }
that = this;
var that = this;
$.post(Routes.postParticipation(this.model.get("id")), { _method: "delete" }, function () {
that.model.set({participation: false});
that.render();