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

Merge pull request #5472 from svbergerem/fix-typo-profile-header

Browse source 
Fix typo in profile_header_view
This commit is contained in:
Jonne Haß 2015-01-06 14:37:34 +01:00
commit d7a3559f4b
2 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/app/pages/profile.js
View file

@ -119,10 +119,7 @@ app.pages.Profile = app.views.Base.extend({
reload: function() { reload: function() {
this.$('#profile').addClass('loading'); this.$('#profile').addClass('loading');
this.model.fetch();
this.asyncSubHeader = $.Deferred();
$.when(this.model.fetch(), this.asyncSubHeader)
.done(_.bind(this._done, this));
}, },
_done: function() { _done: function() {

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

@ -44,7 +44,6 @@ app.views.ProfileHeader = app.views.Base.extend({
var self = this; var self = this;
var dropdownEl = this.$('.aspect_membership_dropdown.placeholder'); var dropdownEl = this.$('.aspect_membership_dropdown.placeholder');
if( dropdownEl.length == 0 ) { if( dropdownEl.length == 0 ) {
this._done();
return; return;
} }
@ -58,12 +57,7 @@ app.views.ProfileHeader = app.views.Base.extend({
// UGLY (re-)attach the facebox // UGLY (re-)attach the facebox
self.$('a[rel*=facebox]').facebox(); self.$('a[rel*=facebox]').facebox();
self._done();
}); });
},
_done: function() {
app.page.asyncSubHeader && app.page.asyncSubHeader.resovle();
} }
}); });
// @license-end // @license-end