wamo/Qvitter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switching stream in the middle of a stream item collapse sometimes left unwanted style attributes in the cache

Browse Source
This commit is contained in:
Hannes Mannerheim 2016-01-09 21:01:34 +01:00
parent a2102eadd1
commit 977faaade3
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
js/dom-functions.js
View File

@ -1218,22 +1218,23 @@ function expand_queet(q,doScrolling) {
} }
} }
} }
function cleanUpAfterCollapseQueet(q) { function cleanUpAfterCollapseQueet(streamItem) {
q.css('height','auto'); var queet = streamItem.children('.queet');
q.children('.queet').css('margin-top','0'); streamItem.css('height','auto');
q.removeClass('expanded'); streamItem.children('.queet').css('margin-top','0');
q.prev().removeClass('next-expanded'); streamItem.removeClass('expanded');
q.removeClass('collapsing'); streamItem.prev().removeClass('next-expanded');
q.find('.expanded-content').remove(); streamItem.removeClass('collapsing');
q.find('.view-more-container-top').remove(); streamItem.find('.expanded-content').remove();
q.find('.view-more-container-bottom').remove(); streamItem.find('.view-more-container-top').remove();
q.find('.inline-reply-queetbox').remove(); streamItem.find('.view-more-container-bottom').remove();
q.find('.stream-item.conversation').remove(); streamItem.find('.inline-reply-queetbox').remove();
q.find('.show-full-conversation').remove(); streamItem.find('.stream-item.conversation').remove();
q.removeAttr('style'); streamItem.find('.show-full-conversation').remove();
q.children('.queet').removeAttr('style'); streamItem.removeAttr('style');
q.children('.queet').find('.queet-thumbs.thumb-num-1').removeAttr('style'); queet.removeAttr('style');
q.children('.queet').find('.queet-thumbs.thumb-num-1 .thumb-container').css('max-height',''); queet.find('.queet-thumbs.thumb-num-1').removeAttr('style');
queet.find('.queet-thumbs.thumb-num-1 .thumb-container').css('max-height','');
} }

9
js/misc-functions.js
View File

@ -939,16 +939,13 @@ function rememberStreamStateInLocalStorage() {
} }
}); });
var feed = $('<div/>').append(firstTwentyVisibleHTML); var feed = $('<div/>').append(firstTwentyVisibleHTML);
feed.find('.view-more-container-top').remove();
feed.find('.view-more-container-bottom').remove();
feed.find('.stream-item.conversation').remove();
feed.find('.expanded-content').remove();
feed.find('.temp-post').remove(); feed.find('.temp-post').remove();
feed.find('.inline-reply-queetbox').remove();
feed.children('.stream-item').removeClass('not-seen'); feed.children('.stream-item').removeClass('not-seen');
feed.children('.stream-item').removeClass('selected-by-keyboard'); feed.children('.stream-item').removeClass('selected-by-keyboard');
feed.find('.show-full-conversation').remove();
feed.find('.stream-item').removeClass('expanded').removeClass('next-expanded').removeClass('hidden').removeClass('collapsing').addClass('visible'); feed.find('.stream-item').removeClass('expanded').removeClass('next-expanded').removeClass('hidden').removeClass('collapsing').addClass('visible');
$.each(feed, function(k,streamItem) {
cleanUpAfterCollapseQueet($(streamItem));
});
var feedHtml = feed.html(); var feedHtml = feed.html();
var profileCardHtml = $('#feed').siblings('.profile-card').outerHTML(); var profileCardHtml = $('#feed').siblings('.profile-card').outerHTML();
var streamData = { var streamData = {