diff --git a/app/assets/javascripts/app/pages/profile.js b/app/assets/javascripts/app/pages/profile.js index c710d6997e3f6498b00888ae77e3df4b2d905676..55d163961a9852ec269b49a24c6ab2ca43c32415 100644 --- a/app/assets/javascripts/app/pages/profile.js +++ b/app/assets/javascripts/app/pages/profile.js @@ -119,10 +119,7 @@ app.pages.Profile = app.views.Base.extend({ reload: function() { this.$('#profile').addClass('loading'); - - this.asyncSubHeader = $.Deferred(); - $.when(this.model.fetch(), this.asyncSubHeader) - .done(_.bind(this._done, this)); + this.model.fetch(); }, _done: function() { diff --git a/app/assets/javascripts/app/views/profile_header_view.js b/app/assets/javascripts/app/views/profile_header_view.js index 681c0830325af3f657ce2c43bd8cc6b8be251378..35bcded5644e39958a201258ff86fd38e64de52d 100644 --- a/app/assets/javascripts/app/views/profile_header_view.js +++ b/app/assets/javascripts/app/views/profile_header_view.js @@ -44,7 +44,6 @@ app.views.ProfileHeader = app.views.Base.extend({ var self = this; var dropdownEl = this.$('.aspect_membership_dropdown.placeholder'); if( dropdownEl.length == 0 ) { - this._done(); return; } @@ -58,12 +57,7 @@ app.views.ProfileHeader = app.views.Base.extend({ // UGLY (re-)attach the facebox self.$('a[rel*=facebox]').facebox(); - self._done(); }); - }, - - _done: function() { - app.page.asyncSubHeader && app.page.asyncSubHeader.resovle(); } }); // @license-end