Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Docking of old widget regressed

This commit is contained in:
Robin Ward 2016-05-31 11:13:04 -04:00
parent b37e14fc62
commit 321a11fe41
No known key found for this signature in database
GPG Key ID: 0E091E2B4ED1B83D
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/assets/javascripts/discourse/components/topic-progress.js.es6
View File

@ -118,25 +118,24 @@ export default Ember.Component.extend({
_dock() { _dock() {
const maximumOffset = $('#topic-footer-buttons').offset(), const maximumOffset = $('#topic-footer-buttons').offset(),
composerHeight = $('#reply-control').height() || 0, composerHeight = $('#reply-control').height() || 0,
$topicProgressWrapper = this.$(), $topicProgressWrapper = this.$(),
style = $topicProgressWrapper.attr('style') || '', offset = window.pageYOffset || $('html').scrollTop();
offset = window.pageYOffset || $('html').scrollTop();
let isDocked = false; let isDocked = false;
if (maximumOffset) { if (maximumOffset) {
const threshold = maximumOffset.top, const threshold = maximumOffset.top,
windowHeight = $(window).height(), windowHeight = $(window).height(),
topicProgressHeight = $('#topic-progress').height(); topicProgressHeight = $('#topic-progress').height();
isDocked = offset >= threshold - windowHeight + topicProgressHeight + composerHeight; isDocked = offset >= threshold - windowHeight + topicProgressHeight + composerHeight;
} }
const dockPos = $(document).height() - $('#topic-bottom').offset().top;
if (composerHeight > 0) { if (composerHeight > 0) {
if (isDocked) { if (isDocked) {
if (style.indexOf('bottom') >= 0) { $topicProgressWrapper.css('bottom', dockPos);
$topicProgressWrapper.css('bottom', '');
}
} else { } else {
const height = composerHeight + "px"; const height = composerHeight + "px";
if ($topicProgressWrapper.css('bottom') !== height) { if ($topicProgressWrapper.css('bottom') !== height) {
@ -144,9 +143,7 @@ export default Ember.Component.extend({
} }
} }
} else { } else {
if (style.indexOf('bottom') >= 0) { $topicProgressWrapper.css('bottom', isDocked ? dockPos : '');
$topicProgressWrapper.css('bottom', '');
}
} }
this.set('docked', isDocked); this.set('docked', isDocked);
}, },