From 59e9597c77cc0c0b0e8a39a20175fc46921c22d5 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@online.de>
Date: Sat, 3 Jan 2015 14:35:41 +0100
Subject: [PATCH] Remove asyncSubHeader from app.pages.Profile
---
app/assets/javascripts/app/pages/profile.js | 5 +----
app/assets/javascripts/app/views/profile_header_view.js | 6 ------
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/app/assets/javascripts/app/pages/profile.js b/app/assets/javascripts/app/pages/profile.js
index c710d6997e..55d163961a 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 681c083032..35bcded564 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
--
GitLab