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

correct regressions, not loading topics on click

Browse source
This commit is contained in:
Sam 2013-06-03 19:03:57 +10:00
parent ef976ba891
commit 24131bcc0e
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/javascripts/discourse/models/topic_list.js
View file

@ -56,10 +56,11 @@ Discourse.TopicList = Discourse.Model.extend({
// loads topics with these ids "before" the current topics // loads topics with these ids "before" the current topics
loadBefore: function(topic_ids){ loadBefore: function(topic_ids){
var _this = this; var _this = this;
Discourse.TopicList.loadTopics(topic_ids, this.get('filter')) var topics = this.get('topics');
.then(function(topics){
_this.forEachNew(topics, function(t) { Discourse.TopicList.loadTopics(topic_ids, this.get('filter'))
.then(function(newTopics){
_this.forEachNew(newTopics, function(t) {
// highlight the first of the new topics so we can get a visual feedback // highlight the first of the new topics so we can get a visual feedback
t.set('highlight', true); t.set('highlight', true);
topics.insertAt(0,t); topics.insertAt(0,t);

17
app/assets/javascripts/discourse/views/topic_view.js
View file

@ -141,6 +141,15 @@ Discourse.TopicView = Discourse.View.extend(Discourse.Scrolling, {
this.get('topicTrackingState').trackIncoming("all"); this.get('topicTrackingState').trackIncoming("all");
}, },
debounceLoadSuggested: Discourse.debounce(function(lookup){
var suggested = this.get('topic.suggested_topics');
Discourse.TopicList.loadTopics(lookup, "").then(function(topics){
suggested.clear();
suggested.pushObjects(topics);
});
}, 1000),
hasNewSuggested: function(){ hasNewSuggested: function(){
var incoming = this.get('topicTrackingState.newIncoming'); var incoming = this.get('topicTrackingState.newIncoming');
var suggested = this.get('topic.suggested_topics'); var suggested = this.get('topic.suggested_topics');
@ -157,10 +166,10 @@ Discourse.TopicView = Discourse.View.extend(Discourse.Scrolling, {
}); });
} }
Discourse.TopicList.loadTopics(lookup, "").then(function(topics){ var topicId = this.get('topic.id');
suggested.clear(); lookup = lookup.exclude(function(id){ return id === topicId; });
suggested.pushObjects(topics);
}); this.debounceLoadSuggested(lookup);
} }
}.observes('topicTrackingState.incomingCount'), }.observes('topicTrackingState.incomingCount'),