discourse/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-09 14:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Scroll jumping in some dimensions of browser

Browse Source
This commit is contained in:
Robin Ward 2016-06-10 14:14:08 -04:00
parent 9ecd5bd599
commit a77f5a75a1
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/assets/javascripts/discourse/widgets/post-stream.js.es6
View File

@ -8,6 +8,7 @@ const DAY = 1000 * 60 * 60 * 24;
const _dontCloak = {}; const _dontCloak = {};
let _cloaked = {}; let _cloaked = {};
let _heights = {};
export function preventCloak(postId) { export function preventCloak(postId) {
_dontCloak[postId] = true; _dontCloak[postId] = true;
@ -17,7 +18,8 @@ export function cloak(post, component) {
if (!CLOAKING_ENABLED || _cloaked[post.id] || _dontCloak[post.id]) { return; } if (!CLOAKING_ENABLED || _cloaked[post.id] || _dontCloak[post.id]) { return; }
const $post = $(`#post_${post.post_number}`); const $post = $(`#post_${post.post_number}`);
_cloaked[post.id] = $post.outerHeight(); _cloaked[post.id] = true;
_heights[post.id] = $post.outerHeight();
Ember.run.debounce(component, 'queueRerender', 1000); Ember.run.debounce(component, 'queueRerender', 1000);
} }
@ -27,7 +29,10 @@ export function uncloak(post, component) {
component.queueRerender(); component.queueRerender();
} }
addWidgetCleanCallback('post-stream', () => _cloaked = {}); addWidgetCleanCallback('post-stream', () => {
_cloaked = {};
_heights = {};
});
export default createWidget('post-stream', { export default createWidget('post-stream', {
tagName: 'div.post-stream', tagName: 'div.post-stream',
@ -88,11 +93,8 @@ export default createWidget('post-stream', {
} }
prevDate = curTime; prevDate = curTime;
const height = _cloaked[post.id]; transformed.height = _heights[post.id];
if (height) { transformed.cloaked = _cloaked[post.id];
transformed.cloaked = true;
transformed.height = height;
}
if (transformed.isSmallAction) { if (transformed.isSmallAction) {
result.push(this.attach('post-small-action', transformed, { model: post })); result.push(this.attach('post-small-action', transformed, { model: post }));

2
app/assets/javascripts/discourse/widgets/post.js.es6
View File

@ -384,7 +384,7 @@ export default createWidget('post', {
shadowTree: true, shadowTree: true,
buildAttributes(attrs) { buildAttributes(attrs) {
return attrs.cloaked ? { style: `height: ${attrs.height}px` } : undefined; return attrs.height ? { style: `height: ${attrs.height}px` } : undefined;
}, },
buildId(attrs) { buildId(attrs) {