From d5b07464ea43920045af8ea94a4fd7e6c971b65b Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 12 Jun 2013 15:24:45 +1000 Subject: [PATCH] partial fix for suggested js error --- app/assets/javascripts/discourse/models/topic_list.js | 11 ++++++++--- app/assets/javascripts/discourse/views/topic_view.js | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/models/topic_list.js b/app/assets/javascripts/discourse/models/topic_list.js index a71057c877..8fc47ae94e 100644 --- a/app/assets/javascripts/discourse/models/topic_list.js +++ b/app/assets/javascripts/discourse/models/topic_list.js @@ -87,9 +87,14 @@ Discourse.TopicList.reopenClass({ // the new topics loaded from the server var newTopics = Discourse.TopicList.topicsFrom(result); - defer.resolve(topic_ids.map(function(id){ - return newTopics.find(function(t){ return t.id === id; }); - })); + var topics = _(topic_ids) + .map(function(id){ + return newTopics.find(function(t){ return t.id === id; }); + }) + .without(undefined) + .value(); + + defer.resolve(topics); } else { defer.reject(); } diff --git a/app/assets/javascripts/discourse/views/topic_view.js b/app/assets/javascripts/discourse/views/topic_view.js index 3d3ea0faa5..2fd71b9ee0 100644 --- a/app/assets/javascripts/discourse/views/topic_view.js +++ b/app/assets/javascripts/discourse/views/topic_view.js @@ -143,7 +143,7 @@ Discourse.TopicView = Discourse.View.extend(Discourse.Scrolling, { if(suggested) { - var existing = _(suggested).map(function(topic){ + var existing = _.map(suggested, function(topic){ return topic.get("id"); });