codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-27 17:46:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

UX: Timeline was snapping to dock too early

Browse source
This commit is contained in:
Robin Ward 2016-06-01 13:30:00 -04:00
parent 3d49a83d7a
commit cc11c352cf
No known key found for this signature in database
GPG key ID: 0E091E2B4ED1B83D
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/discourse/components/mount-widget.js.es6
View file

@ -95,7 +95,6 @@ export default Ember.Component.extend({
if (!this._widgetClass) { return; }
const t0 = new Date().getTime();
const args = this.get('args') || this.buildArgs();
const opts = { model: this.get('model') };
const newTree = new this._widgetClass(args, this.container, opts);
@ -119,8 +118,6 @@ export default Ember.Component.extend({
if (this.profileWidget) {
console.log(new Date().getTime() - t0);
}
}
}
});

2
app/assets/javascripts/discourse/components/topic-timeline.js.es6
View file

@ -39,7 +39,7 @@ export default MountWidget.extend(Docking, {
this.dockBottom = false;
if (posTop < topicTop) {
this.dockAt = topicTop;
} else if (pos > topicBottom) {
} else if (pos > topicBottom + footerHeight) {
this.dockAt = (topicBottom - timelineHeight) + footerHeight;
this.dockBottom = true;
if (this.dockAt < 0) { this.dockAt = 0; }