From 387290b1e70be0052c6dd9be84069f55d54a7ce7 Mon Sep 17 00:00:00 2001
From: Per Nilsson <per.nilsson@formidablelabs.com>
Date: Mon, 4 May 2015 17:20:50 -0700
Subject: [PATCH] Update rendered-count _after_ async results have displayed

This ensures that all async results are rendered.
---
 src/typeahead/dataset.js       |  2 +-
 test/typeahead/dataset_spec.js | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/typeahead/dataset.js b/src/typeahead/dataset.js
index fce09c30..0949cfff 100644
--- a/src/typeahead/dataset.js
+++ b/src/typeahead/dataset.js
@@ -269,8 +269,8 @@ var Dataset = (function() {
         // do not render the suggestions as they've become outdated
         if (!canceled && rendered < that.limit) {
           that.cancel = $.noop;
-          rendered += suggestions.length;
           that._append(query, suggestions.slice(0, that.limit - rendered));
+          rendered += suggestions.length;
 
           that.async && that.trigger('asyncReceived', query);
         }
diff --git a/test/typeahead/dataset_spec.js b/test/typeahead/dataset_spec.js
index e6560a50..4ef3d159 100644
--- a/test/typeahead/dataset_spec.js
+++ b/test/typeahead/dataset_spec.js
@@ -366,6 +366,18 @@ describe('Dataset', function() {
       });
     });
 
+    it('should render all async suggestions if sync had no content', function() {
+      this.source.andCallFake(fakeGetWithEmptySyncAndAsyncSuggestions);
+      this.dataset.update('woah');
+
+      waits(100);
+
+      runs(function() {
+        var rendered = this.dataset.$el.find('.tt-suggestion');
+        expect(rendered).toHaveLength(5);
+      });
+    });
+
     it('should trigger rendered after suggestions are rendered', function() {
       var spy;
 
@@ -466,4 +478,19 @@ describe('Dataset', function() {
       ]);
     }, 0);
   }
+
+  function fakeGetWithEmptySyncAndAsyncSuggestions(query, sync, async) {
+    sync([]);
+
+    setTimeout(function() {
+      async([
+        { value: 'four', raw: { value: 'four' } },
+        { value: 'five', raw: { value: 'five' } },
+        { value: 'six', raw: { value: 'six' } },
+        { value: 'seven', raw: { value: 'seven' } },
+        { value: 'eight', raw: { value: 'eight' } },
+      ]);
+    }, 0);
+  }
+
 });