cancel the second video request when a new search has begun, fixes #25

Rayman · Sep 21, 2014 · 206c3cf · 206c3cf
1 parent 9c17ef9
commit 206c3cf
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/client/views/playlists/playlists.js b/client/views/playlists/playlists.js
@@ -417,6 +417,7 @@ var searchResultsDependency = new Deps.Dependency();
 
 youtubeSearchQuery = function(options) {
   options = options || {};
+  var currentSearchTimer = searchTimer;
 
   Meteor.call('youtube_search', options, function(error, data) {
     if (error) {
@@ -428,6 +429,11 @@ youtubeSearchQuery = function(options) {
     searchResults = data; // TODO: search result data != videoQuery data
     searchResultsDependency.changed();
 
+    if (currentSearchTimer != searchTimer) {
+      console.warn('cancel video query');
+      return;
+    }
+
     // query for more details (needs optimization)
     var ids = _.pluck(_.pluck(data.items, 'id'), 'videoId');
     console.log('load more data for ', ids);