fix modals' scroll on resuming

This commit is contained in:
Simon Grim 2016-02-16 04:17:33 +05:00
parent 44e190bc4a
commit bf88024cb3

View File

@ -165,13 +165,7 @@ function minimizeModal(modal, switchMode) {
if (modal.is('.closed')) return; if (modal.is('.closed')) return;
var scroll; // MUST be setted before modal.detach(), modal.fadeOut() and so on var scroll; // MUST be setted before modal.detach(), modal.fadeOut() and so on
if (modal.is('.directMessages') || modal.is('.group-messages-new-group') if (modal.is('.profile-modal')) {
|| modal.is('.group-messages-join-group') || modal.is('.following-own-modal')) {
scroll = {
targetSelector: '.modal-content',
top: modal.find('.modal-content').scrollTop()
};
} else if (modal.is('.profile-modal')) {
if (modal.find('.profile-card').attr('data-screen-name')[0] === '*') if (modal.find('.profile-card').attr('data-screen-name')[0] === '*')
scroll = { scroll = {
targetSelector: '.modal-content .members', targetSelector: '.modal-content .members',
@ -182,7 +176,11 @@ function minimizeModal(modal, switchMode) {
targetSelector: '.modal-content .postboard-posts', targetSelector: '.modal-content .postboard-posts',
top: modal.find('.modal-content .postboard-posts').scrollTop() top: modal.find('.modal-content .postboard-posts').scrollTop()
}; };
} } else
scroll = {
targetSelector: '.modal-content',
top: modal.find('.modal-content').scrollTop()
};
if (switchMode) if (switchMode)
minimize(modal, scroll); minimize(modal, scroll);