don't update (and open) popup if it's already closed

This commit is contained in:
Hannes Mannerheim 2015-06-05 02:45:20 +02:00
parent d749713ef3
commit ddddbfd87d

View File

@ -1032,10 +1032,13 @@ $('body').on('click','a', function(e) {
// but always query the server also // but always query the server also
getFromAPI('users/show.json?id=' + localNickname,function(data){ getFromAPI('users/show.json?id=' + localNickname,function(data){
if(data) { if(data) {
// update the popup if it's still open
if($('#popup-local-profile').length>0) {
openLocalProfileInPopup(data); openLocalProfileInPopup(data);
remove_spinner(); remove_spinner();
$('.local-profile-clicked').removeClass('local-profile-clicked'); $('.local-profile-clicked').removeClass('local-profile-clicked');
} }
}
}); });
} }
} }
@ -1114,11 +1117,13 @@ $('body').on('click','a', function(e) {
if(data && data.external !== null) { if(data && data.external !== null) {
// update the popup if it's still open
if($('#popup-local-profile').length>0) {
openExternalProfileInPopup(data); openExternalProfileInPopup(data);
remove_spinner(); remove_spinner();
$('.external-profile-clicked').removeClass('external-profile-clicked'); $('.external-profile-clicked').removeClass('external-profile-clicked');
} }
}
// if external lookup failed, and we don't have a cached profile card, trigger click again. // if external lookup failed, and we don't have a cached profile card, trigger click again.
// it will not be hijacked since we don't remove the external-profile-clicked class here // it will not be hijacked since we don't remove the external-profile-clicked class here
else if($('#popup-external-profile-spinner').length > 0){ else if($('#popup-external-profile-spinner').length > 0){