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

FIX: More incorrect scrollbar positions on the timeline

This commit is contained in:
Robin Ward 2016-05-20 16:54:53 -04:00
parent dd036b73bf
commit 1ed2723986
No known key found for this signature in database
GPG Key ID: 0E091E2B4ED1B83D
5 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/discourse/components/topic-timeline.js.es6
View File

@ -8,6 +8,7 @@ export default MountWidget.extend(Docking, {
buildArgs() { buildArgs() {
return { topic: this.get('topic'), return { topic: this.get('topic'),
topicTrackingState: this.topicTrackingState, topicTrackingState: this.topicTrackingState,
enteredIndex: this.get('enteredIndex'),
dockAt: this.dockAt }; dockAt: this.dockAt };
}, },

1
app/assets/javascripts/discourse/controllers/topic.js.es6
View File

@ -19,6 +19,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
queryParams: ['filter', 'username_filters', 'show_deleted'], queryParams: ['filter', 'username_filters', 'show_deleted'],
loadedAllPosts: Ember.computed.or('model.postStream.loadedAllPosts', 'model.postStream.loadingLastPost'), loadedAllPosts: Ember.computed.or('model.postStream.loadedAllPosts', 'model.postStream.loadingLastPost'),
enteredAt: null, enteredAt: null,
enteredIndex: null,
retrying: false, retrying: false,
topicDelegated: [ topicDelegated: [

1
app/assets/javascripts/discourse/routes/topic-from-params.js.es6
View File

@ -32,6 +32,7 @@ export default Discourse.Route.extend({
topicController.setProperties({ topicController.setProperties({
'model.currentPost': closest, 'model.currentPost': closest,
enteredIndex: postStream.get('stream').indexOf(closestPost.get('id')),
enteredAt: new Date().getTime().toString(), enteredAt: new Date().getTime().toString(),
}); });

5
app/assets/javascripts/discourse/templates/topic.hbs
View File

@ -72,7 +72,10 @@
<div class="posts-wrapper"> <div class="posts-wrapper">
{{#if showTimeline}} {{#if showTimeline}}
{{topic-timeline topic=model loading=model.postStream.loading delegated=topicDelegated}} {{topic-timeline topic=model
enteredIndex=enteredIndex
loading=model.postStream.loading
delegated=topicDelegated}}
{{else}} {{else}}
{{topic-progress topic=model delegated=topicDelegated}} {{topic-progress topic=model delegated=topicDelegated}}
{{topic-admin-menu-button topic=model fixed="true" delegated=topicDelegated}} {{topic-admin-menu-button topic=model fixed="true" delegated=topicDelegated}}

9
app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
View File

@ -87,7 +87,7 @@ createWidget('timeline-scrollarea', {
}, },
defaultState(attrs) { defaultState(attrs) {
return { percentage: this._percentFor(attrs.topic, attrs.topic.currentPost), scrolledPost: 1 }; return { percentage: this._percentFor(attrs.topic, attrs.enteredIndex + 1), scrolledPost: 1 };
}, },
position() { position() {
@ -174,7 +174,12 @@ createWidget('timeline-scrollarea', {
_percentFor(topic, postNumber) { _percentFor(topic, postNumber) {
const total = topic.get('postStream.filteredPostsCount'); const total = topic.get('postStream.filteredPostsCount');
return postNumber === 1 ? 0.0 : parseFloat(postNumber) / total; console.log(postNumber, total);
let result = (postNumber === 1) ? 0.0 : parseFloat(postNumber) / total;
if (result < 0) { return 0.0; }
if (result > 1.0) { return 1.0; }
return result;
} }
}); });