From 4ddfe2ef3b79ae14d48b4e0e15a0dda8cf906832 Mon Sep 17 00:00:00 2001
From: Jake Harding <jharding@twitter.com>
Date: Fri, 27 Dec 2013 23:24:23 -0800
Subject: [PATCH 01/17] Remove pre-existing cursor on hover. Fixes #580.

---
 src/typeahead/dropdown.js  |  7 ++++---
 test/dropdown_view_spec.js | 24 ++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/typeahead/dropdown.js b/src/typeahead/dropdown.js
index 52a58c59..3c7c1bee 100644
--- a/src/typeahead/dropdown.js
+++ b/src/typeahead/dropdown.js
@@ -65,7 +65,8 @@ var Dropdown = (function() {
     },
 
     _onSuggestionMouseEnter: function onSuggestionMouseEnter($e) {
-      this._setCursor($($e.currentTarget));
+      this._removeCursor();
+      this._setCursor($($e.currentTarget), true);
     },
 
     _onSuggestionMouseLeave: function onSuggestionMouseLeave($e) {
@@ -100,10 +101,10 @@ var Dropdown = (function() {
       return this.$menu.find('.tt-cursor').first();
     },
 
-    _setCursor: function setCursor($el) {
+    _setCursor: function setCursor($el, silent) {
       $el.first().addClass('tt-cursor');
 
-      this.trigger('cursorMoved');
+      !silent && this.trigger('cursorMoved');
     },
 
     _removeCursor: function removeCursor() {
diff --git a/test/dropdown_view_spec.js b/test/dropdown_view_spec.js
index 184ccf02..2b0cb07b 100644
--- a/test/dropdown_view_spec.js
+++ b/test/dropdown_view_spec.js
@@ -50,6 +50,19 @@ describe('Dropdown', function() {
   });
 
   describe('when mouseenter is triggered on a suggestion', function() {
+    it('should remove pre-existing cursor', function() {
+      var $first, $last;
+
+      $first = this.$menu.find('.tt-suggestion').first();
+      $last = this.$menu.find('.tt-suggestion').last();
+
+      $first.addClass('tt-cursor');
+      $last.mouseenter();
+
+      expect($first).not.toHaveClass('tt-cursor');
+      expect($last).toHaveClass('tt-cursor');
+    });
+
     it('should set the cursor', function() {
       var $suggestion;
 
@@ -58,6 +71,17 @@ describe('Dropdown', function() {
 
       expect($suggestion).toHaveClass('tt-cursor');
     });
+
+    it('should not trigger cursorMoved', function() {
+      var spy, $suggestion;
+
+      this.view.onSync('cursorMoved', spy = jasmine.createSpy());
+
+      $suggestion = this.$menu.find('.tt-suggestion').first();
+      $suggestion.mouseenter();
+
+      expect(spy).not.toHaveBeenCalled();
+    });
   });
 
   describe('when mouseleave is triggered on a suggestion', function() {

From 2c68b01b3b5f185945e487491495bbae0d611c17 Mon Sep 17 00:00:00 2001
From: Jake Harding <jharding@twitter.com>
Date: Mon, 30 Dec 2013 03:50:21 -0800
Subject: [PATCH 02/17] Fix return values of adapted dataset.

---
 src/dataset/dataset.js  | 4 +---
 src/typeahead/plugin.js | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/dataset/dataset.js b/src/dataset/dataset.js
index fbfe89c8..f2286eaf 100644
--- a/src/dataset/dataset.js
+++ b/src/dataset/dataset.js
@@ -150,7 +150,7 @@ var Dataset = (function() {
       this.transport = this.remote ? new Transport(this.remote) : null;
       this.initialize = function initialize() { return that; };
 
-      return this;
+      return deferred.promise();
 
       function addLocalToIndex() { that.add(that.local); }
     },
@@ -162,8 +162,6 @@ var Dataset = (function() {
       normalized = this._normalize(data);
 
       this.index.add(normalized);
-
-      return this;
     },
 
     get: function get(query, cb) {
diff --git a/src/typeahead/plugin.js b/src/typeahead/plugin.js
index 0991f3a6..ee7a164e 100644
--- a/src/typeahead/plugin.js
+++ b/src/typeahead/plugin.js
@@ -121,13 +121,13 @@
     source = _.bind(dataset.get, dataset);
 
     source.initialize = function() {
-      dataset.initialize();
-      return source;
+      // returns a promise that is resolved after prefetch data
+      // is loaded and processed
+      return dataset.initialize();
     };
 
     source.add = function(data) {
       dataset.add();
-      return source;
     };
 
     return source;

From 2c6d99a81f0a5c04d55ac484f09f5d995cffd9bc Mon Sep 17 00:00:00 2001
From: Jake Harding <jharding@twitter.com>
Date: Mon, 30 Dec 2013 06:48:07 -0800
Subject: [PATCH 03/17] Rename dataset to bloodhound.

---
 Gruntfile.js                                  | 24 ++---
 karma.conf.js                                 | 12 +--
 .../dataset.js => bloodhound/bloodhound.js}   | 10 +-
 src/{dataset => bloodhound}/lru_cache.js      |  0
 .../persistent_storage.js                     |  0
 src/{dataset => bloodhound}/search_index.js   |  0
 src/{dataset => bloodhound}/transport.js      |  0
 src/{dataset => bloodhound}/version.js        |  0
 src/typeahead/plugin.js                       | 16 ++--
 test/{dataset_spec.js => bloodhound_spec.js}  | 94 +++++++++----------
 test/helpers/typeahead_mocks.js               |  2 +-
 11 files changed, 79 insertions(+), 79 deletions(-)
 rename src/{dataset/dataset.js => bloodhound/bloodhound.js} (98%)
 rename src/{dataset => bloodhound}/lru_cache.js (100%)
 rename src/{dataset => bloodhound}/persistent_storage.js (100%)
 rename src/{dataset => bloodhound}/search_index.js (100%)
 rename src/{dataset => bloodhound}/transport.js (100%)
 rename src/{dataset => bloodhound}/version.js (100%)
 rename test/{dataset_spec.js => bloodhound_spec.js} (72%)

diff --git a/Gruntfile.js b/Gruntfile.js
index 12cc7dee..36ec2055 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -4,13 +4,13 @@ var semver = require('semver'),
       common: [
       'src/common/utils.js'
       ],
-      dataset: [
-      'src/dataset/version.js',
-      'src/dataset/lru_cache.js',
-      'src/dataset/persistent_storage.js',
-      'src/dataset/transport.js',
-      'src/dataset/search_index.js',
-      'src/dataset/dataset.js'
+      bloodhound: [
+      'src/bloodhound/version.js',
+      'src/bloodhound/lru_cache.js',
+      'src/bloodhound/persistent_storage.js',
+      'src/bloodhound/transport.js',
+      'src/bloodhound/search_index.js',
+      'src/bloodhound/bloodhound.js'
       ],
       typeahead: [
       'src/typeahead/html.js',
@@ -45,14 +45,14 @@ module.exports = function(grunt) {
         banner: '<%= banner %>',
         enclose: { 'window.jQuery': '$' }
       },
-      dataset: {
+      bloodhound: {
         options: {
           mangle: false,
           beautify: true,
           compress: false
         },
-        src: files.common.concat(files.dataset),
-        dest: '<%= buildDir %>/dataset.js'
+        src: files.common.concat(files.bloodhound),
+        dest: '<%= buildDir %>/bloodhound.js'
       },
       typeahead: {
         options: {
@@ -70,7 +70,7 @@ module.exports = function(grunt) {
           beautify: true,
           compress: false
         },
-        src: files.common.concat(files.dataset, files.typeahead),
+        src: files.common.concat(files.bloodhound, files.typeahead),
         dest: '<%= buildDir %>/typeahead.bundle.js'
 
       },
@@ -79,7 +79,7 @@ module.exports = function(grunt) {
           mangle: true,
           compress: true
         },
-        src: files.common.concat(files.dataset, files.typeahead),
+        src: files.common.concat(files.bloodhound, files.typeahead),
         dest: '<%= buildDir %>/typeahead.bundle.min.js'
       }
     },
diff --git a/karma.conf.js b/karma.conf.js
index 5b65b8b3..82fa3873 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -10,12 +10,12 @@ basePath = '';
 files = [
   'test/vendor/**/*',
   'src/common/utils.js',
-  'src/dataset/version.js',
-  'src/dataset/lru_cache.js',
-  'src/dataset/persistent_storage.js',
-  'src/dataset/transport.js',
-  'src/dataset/search_index.js',
-  'src/dataset/dataset.js',
+  'src/bloodhound/version.js',
+  'src/bloodhound/lru_cache.js',
+  'src/bloodhound/persistent_storage.js',
+  'src/bloodhound/transport.js',
+  'src/bloodhound/search_index.js',
+  'src/bloodhound/bloodhound.js',
   'src/typeahead/html.js',
   'src/typeahead/css.js',
   'src/typeahead/event_bus.js',
diff --git a/src/dataset/dataset.js b/src/bloodhound/bloodhound.js
similarity index 98%
rename from src/dataset/dataset.js
rename to src/bloodhound/bloodhound.js
index f2286eaf..b0096818 100644
--- a/src/dataset/dataset.js
+++ b/src/bloodhound/bloodhound.js
@@ -4,7 +4,7 @@
  * Copyright 2013 Twitter, Inc. and other contributors; Licensed MIT
  */
 
-var Dataset = (function() {
+var Bloodhound = (function() {
   var keys;
 
   keys = { data: 'data', protocol: 'protocol', thumbprint: 'thumbprint' };
@@ -12,7 +12,7 @@ var Dataset = (function() {
   // constructor
   // -----------
 
-  function Dataset(o) {
+  function Bloodhound(o) {
     if (!o || (!o.local && !o.prefetch && !o.remote)) {
       $.error('one of local, prefetch, or remote is required');
     }
@@ -40,7 +40,7 @@ var Dataset = (function() {
   // instance methods
   // ----------------
 
-  _.mixin(Dataset.prototype, {
+  _.mixin(Bloodhound.prototype, {
 
     // ### private
 
@@ -137,7 +137,7 @@ var Dataset = (function() {
     // ### public
 
     // the contents of this function are broken out of the constructor
-    // to help improve the testability of datasets
+    // to help improve the testability of bloodhounds
     initialize: function initialize() {
       var that = this, deferred;
 
@@ -207,7 +207,7 @@ var Dataset = (function() {
     }
   });
 
-  return Dataset;
+  return Bloodhound;
 
   // helper functions
   // ----------------
diff --git a/src/dataset/lru_cache.js b/src/bloodhound/lru_cache.js
similarity index 100%
rename from src/dataset/lru_cache.js
rename to src/bloodhound/lru_cache.js
diff --git a/src/dataset/persistent_storage.js b/src/bloodhound/persistent_storage.js
similarity index 100%
rename from src/dataset/persistent_storage.js
rename to src/bloodhound/persistent_storage.js
diff --git a/src/dataset/search_index.js b/src/bloodhound/search_index.js
similarity index 100%
rename from src/dataset/search_index.js
rename to src/bloodhound/search_index.js
diff --git a/src/dataset/transport.js b/src/bloodhound/transport.js
similarity index 100%
rename from src/dataset/transport.js
rename to src/bloodhound/transport.js
diff --git a/src/dataset/version.js b/src/bloodhound/version.js
similarity index 100%
rename from src/dataset/version.js
rename to src/bloodhound/version.js
diff --git a/src/typeahead/plugin.js b/src/typeahead/plugin.js
index ee7a164e..abb56d27 100644
--- a/src/typeahead/plugin.js
+++ b/src/typeahead/plugin.js
@@ -24,9 +24,9 @@
           // HACK: force highlight as a top-level config
           section.highlight = !!o.highlight;
 
-          // if source is an object, convert it to a dataset
+          // if source is an object, convert it to a bloodhound
           section.source = _.isObject(section.source) ?
-            datasetAdapter(section.source).initialize() : section.source;
+            bloodhoundAdapter(section.source).initialize() : section.source;
         });
 
         typeahead = new Typeahead({
@@ -112,22 +112,22 @@
     }
   };
 
-  jQuery.fn.typeahead.datasetAdapter = datasetAdapter;
+  jQuery.fn.typeahead.bloodhoundAdapter = bloodhoundAdapter;
 
-  function datasetAdapter(dataset) {
+  function bloodhoundAdapter() {
     var source;
 
-    dataset = _.isObject(dataset) ? new Dataset(dataset) : dataset;
-    source = _.bind(dataset.get, dataset);
+    bloodhound = _.isObject(bloodhound) ? new Bloodhound(bloodhound) : bloodhound;
+    source = _.bind(bloodhound.get, bloodhound);
 
     source.initialize = function() {
       // returns a promise that is resolved after prefetch data
       // is loaded and processed
-      return dataset.initialize();
+      return bloodhound.initialize();
     };
 
     source.add = function(data) {
-      dataset.add();
+      bloodhound.add();
     };
 
     return source;
diff --git a/test/dataset_spec.js b/test/bloodhound_spec.js
similarity index 72%
rename from test/dataset_spec.js
rename to test/bloodhound_spec.js
index 3ab9547a..96c00c65 100644
--- a/test/dataset_spec.js
+++ b/test/bloodhound_spec.js
@@ -1,4 +1,4 @@
-describe('Dataset', function() {
+describe('Bloodhound', function() {
 
   beforeEach(function() {
     jasmine.Ajax.useMock();
@@ -12,14 +12,14 @@ describe('Dataset', function() {
 
   describe('local', function() {
     beforeEach(function() {
-      this.dataset = new Dataset({ local: fixtures.data.simple });
-      this.dataset.initialize();
+      this.bloodhound = new Bloodhound({ local: fixtures.data.simple });
+      this.bloodhound.initialize();
     });
 
-    it('should hydrate the dataset', function() {
+    it('should hydrate the bloodhound', function() {
       var spy = jasmine.createSpy();
 
-      this.dataset.get('big', spy);
+      this.bloodhound.get('big', spy);
 
       expect(spy).toHaveBeenCalledWith([
         { value: 'big' },
@@ -33,30 +33,30 @@ describe('Dataset', function() {
     it('should throw error if url is not set', function() {
       expect(test).toThrow();
 
-      function test() { var d = new Dataset({ prefetch: {} }); }
+      function test() { var d = new Bloodhound({ prefetch: {} }); }
     });
 
     it('should use url or cacheKey to store data locally', function() {
       var ttl = 100;
 
-      this.dataset1 = new Dataset({
+      this.bloodhound1 = new Bloodhound({
         prefetch: { url: '/test1', cacheKey: 'woah' }
       });
       expect(PersistentStorage).toHaveBeenCalledWith('woah');
 
-      this.dataset2 = new Dataset({
+      this.bloodhound2 = new Bloodhound({
         prefetch: { url: '/test2', ttl: ttl, thumbprint: '!' }
       });
       expect(PersistentStorage).toHaveBeenCalledWith('/test2');
 
-      this.dataset2.initialize();
+      this.bloodhound2.initialize();
       ajaxRequests[0].response(fixtures.ajaxResps.ok);
 
-      expect(this.dataset2.storage.set)
+      expect(this.bloodhound2.storage.set)
         .toHaveBeenCalledWith('data', fixtures.serialized.simple, ttl);
-      expect(this.dataset2.storage.set)
+      expect(this.bloodhound2.storage.set)
         .toHaveBeenCalledWith('protocol', 'http:', ttl);
-      expect(this.dataset2.storage.set)
+      expect(this.bloodhound2.storage.set)
         .toHaveBeenCalledWith('thumbprint', '%VERSION%!', ttl);
     });
 
@@ -66,10 +66,10 @@ describe('Dataset', function() {
       spy1 = jasmine.createSpy();
       spy2 = jasmine.createSpy();
 
-      this.dataset1 = new Dataset({ prefetch: '/test1' });
-      this.dataset2 = new Dataset({ prefetch: { url: '/test2' } });
-      this.dataset1.initialize();
-      this.dataset2.initialize();
+      this.bloodhound1 = new Bloodhound({ prefetch: '/test1' });
+      this.bloodhound2 = new Bloodhound({ prefetch: { url: '/test2' } });
+      this.bloodhound1.initialize();
+      this.bloodhound2.initialize();
 
       ajaxRequests[0].response(fixtures.ajaxResps.ok);
       ajaxRequests[1].response(fixtures.ajaxResps.ok);
@@ -77,8 +77,8 @@ describe('Dataset', function() {
       expect(ajaxRequests[0].url).toBe('/test1');
       expect(ajaxRequests[1].url).toBe('/test2');
 
-      this.dataset1.get('big', spy1);
-      this.dataset2.get('big', spy2);
+      this.bloodhound1.get('big', spy1);
+      this.bloodhound2.get('big', spy2);
 
       expect(spy1).toHaveBeenCalledWith([
         { value: 'big' },
@@ -99,16 +99,16 @@ describe('Dataset', function() {
       filterSpy = jasmine.createSpy().andCallFake(fakeFilter);
       spy = jasmine.createSpy();
 
-      this.dataset = new Dataset({
+      this.bloodhound = new Bloodhound({
         prefetch: { url: '/test', filter: filterSpy }
       });
-      this.dataset.initialize();
+      this.bloodhound.initialize();
 
       mostRecentAjaxRequest().response(fixtures.ajaxResps.ok);
 
       expect(filterSpy).toHaveBeenCalled();
 
-      this.dataset.get('big', spy);
+      this.bloodhound.get('big', spy);
 
       expect(spy).toHaveBeenCalledWith([
         { value: 'BIG' },
@@ -124,13 +124,13 @@ describe('Dataset', function() {
     it('should not make a request if data is available in storage', function() {
       var that = this, spy = jasmine.createSpy();
 
-      this.dataset = new Dataset({ name: 'name', prefetch: '/test' });
-      this.dataset.storage.get.andCallFake(fakeGet);
-      this.dataset.initialize();
+      this.bloodhound = new Bloodhound({ name: 'name', prefetch: '/test' });
+      this.bloodhound.storage.get.andCallFake(fakeGet);
+      this.bloodhound.initialize();
 
       expect(mostRecentAjaxRequest()).toBeNull();
 
-      this.dataset.get('big', spy);
+      this.bloodhound.get('big', spy);
 
       expect(spy).toHaveBeenCalledWith([
         { value: 'big' },
@@ -149,7 +149,7 @@ describe('Dataset', function() {
             val = 'http:';
             break;
           case 'thumbprint':
-            val = that.dataset.prefetch.thumbprint;
+            val = that.bloodhound.prefetch.thumbprint;
             break;
         }
 
@@ -160,29 +160,29 @@ describe('Dataset', function() {
 
   describe('remote', function() {
     it('should perform query substitution on the provided url', function() {
-      this.dataset1 = new Dataset({
+      this.bloodhound1 = new Bloodhound({
         remote: { url: '/test?q=$$', wildcard: '$$' }
       });
-      this.dataset2 = new Dataset({
+      this.bloodhound2 = new Bloodhound({
         remote: {
           url: '/test?q=%QUERY',
           replace: function(str, query) {return str.replace('%QUERY', query);  }
         }
       });
 
-      this.dataset1.initialize();
-      this.dataset2.initialize();
+      this.bloodhound1.initialize();
+      this.bloodhound2.initialize();
 
-      this.dataset1.get('one two', $.noop);
-      this.dataset2.get('one two', $.noop);
+      this.bloodhound1.get('one two', $.noop);
+      this.bloodhound2.get('one two', $.noop);
 
-      expect(this.dataset1.transport.get).toHaveBeenCalledWith(
+      expect(this.bloodhound1.transport.get).toHaveBeenCalledWith(
         '/test?q=one%20two',
         { method: 'get', dataType: 'json' },
         jasmine.any(Function)
       );
 
-      expect(this.dataset2.transport.get).toHaveBeenCalledWith(
+      expect(this.bloodhound2.transport.get).toHaveBeenCalledWith(
         '/test?q=one two',
         { method: 'get', dataType: 'json' },
         jasmine.any(Function)
@@ -195,13 +195,13 @@ describe('Dataset', function() {
       spy = jasmine.createSpy();
       filterSpy = jasmine.createSpy().andCallFake(fakeFilter);
 
-      this.dataset = new Dataset({
+      this.bloodhound = new Bloodhound({
         remote: { url: '/test', filter: filterSpy }
       });
-      this.dataset.initialize();
+      this.bloodhound.initialize();
 
-      this.dataset.transport.get.andCallFake(fakeGet);
-      this.dataset.get('big', spy);
+      this.bloodhound.transport.get.andCallFake(fakeGet);
+      this.bloodhound.get('big', spy);
 
       waitsFor(function() { return spy.callCount; });
 
@@ -227,11 +227,11 @@ describe('Dataset', function() {
     it('should call #get callback once if cache hit', function() {
       var spy = jasmine.createSpy();
 
-      this.dataset = new Dataset({ remote: '/test?q=%QUERY' });
-      this.dataset.initialize();
-      this.dataset.transport.get.andCallFake(fakeGet);
+      this.bloodhound = new Bloodhound({ remote: '/test?q=%QUERY' });
+      this.bloodhound.initialize();
+      this.bloodhound.transport.get.andCallFake(fakeGet);
 
-      this.dataset.get('dog', spy);
+      this.bloodhound.get('dog', spy);
 
       expect(spy.callCount).toBe(1);
 
@@ -249,17 +249,17 @@ describe('Dataset', function() {
       spy1 = jasmine.createSpy();
       spy2 = jasmine.createSpy();
 
-      this.dataset = new Dataset({
+      this.bloodhound = new Bloodhound({
         limit: 3,
         local: fixtures.data.simple,
         remote: { url: '/test?q=%QUERY' }
       });
-      this.dataset.initialize();
+      this.bloodhound.initialize();
 
-      this.dataset.transport.get.andCallFake(fakeGet);
+      this.bloodhound.transport.get.andCallFake(fakeGet);
 
-      this.dataset.get('big', spy1);
-      this.dataset.get('bigg', spy2);
+      this.bloodhound.get('big', spy1);
+      this.bloodhound.get('bigg', spy2);
 
       expect(spy1.callCount).toBe(1);
       expect(spy2.callCount).toBe(1);
diff --git a/test/helpers/typeahead_mocks.js b/test/helpers/typeahead_mocks.js
index 2306d526..1c8ea64a 100644
--- a/test/helpers/typeahead_mocks.js
+++ b/test/helpers/typeahead_mocks.js
@@ -2,7 +2,7 @@
   var components;
 
   components = [
-    'Dataset',
+    'Bloodhound',
     'PersistentStorage',
     'Transport',
     'SearchIndex',

From 9e5ddf4a74ccdd9d7a1b75af73e2d8898ceba2bc Mon Sep 17 00:00:00 2001
From: Jake Harding <jharding@twitter.com>
Date: Mon, 30 Dec 2013 04:42:08 -0800
Subject: [PATCH 04/17] Rename section to dataset.

Conflicts:
	src/typeahead/plugin.js
---
 Gruntfile.js                                  |  2 +-
 karma.conf.js                                 |  2 +-
 src/bloodhound/bloodhound.js                  |  2 +-
 src/typeahead/{section.js => dataset.js}      | 24 +++---
 src/typeahead/dropdown.js                     | 38 ++++-----
 src/typeahead/html.js                         |  2 +-
 src/typeahead/plugin.js                       | 44 ++++++++---
 src/typeahead/typeahead.js                    | 18 ++---
 ...tion_view_spec.js => dataset_view_spec.js} | 78 +++++++++----------
 test/dropdown_view_spec.js                    | 42 +++++-----
 test/fixtures/html.js                         |  4 +-
 test/helpers/typeahead_mocks.js               |  2 +-
 test/playground.html                          |  1 +
 test/typeahead_view_spec.js                   |  8 +-
 14 files changed, 145 insertions(+), 122 deletions(-)
 rename src/typeahead/{section.js => dataset.js} (87%)
 rename test/{section_view_spec.js => dataset_view_spec.js} (61%)

diff --git a/Gruntfile.js b/Gruntfile.js
index 36ec2055..328dc9fc 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -19,7 +19,7 @@ var semver = require('semver'),
       'src/typeahead/event_emitter.js',
       'src/typeahead/highlight.js',
       'src/typeahead/input.js',
-      'src/typeahead/section.js',
+      'src/typeahead/dataset.js',
       'src/typeahead/dropdown.js',
       'src/typeahead/typeahead.js',
       'src/typeahead/plugin.js'
diff --git a/karma.conf.js b/karma.conf.js
index 82fa3873..8a7719fe 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -22,7 +22,7 @@ files = [
   'src/typeahead/event_emitter.js',
   'src/typeahead/highlight.js',
   'src/typeahead/input.js',
-  'src/typeahead/section.js',
+  'src/typeahead/dataset.js',
   'src/typeahead/dropdown.js',
   'src/typeahead/typeahead.js',
   'src/typeahead/plugin.js',
diff --git a/src/bloodhound/bloodhound.js b/src/bloodhound/bloodhound.js
index b0096818..3c5dcbd0 100644
--- a/src/bloodhound/bloodhound.js
+++ b/src/bloodhound/bloodhound.js
@@ -148,7 +148,7 @@ var Bloodhound = (function() {
       this.local && deferred.done(addLocalToIndex);
 
       this.transport = this.remote ? new Transport(this.remote) : null;
-      this.initialize = function initialize() { return that; };
+      this.initialize = function initialize() { return deferred.promise(); };
 
       return deferred.promise();
 
diff --git a/src/typeahead/section.js b/src/typeahead/dataset.js
similarity index 87%
rename from src/typeahead/section.js
rename to src/typeahead/dataset.js
index 191ab9c3..46082e35 100644
--- a/src/typeahead/section.js
+++ b/src/typeahead/dataset.js
@@ -4,13 +4,13 @@
  * Copyright 2013 Twitter, Inc. and other contributors; Licensed MIT
  */
 
-var Section = (function() {
-  var sectionKey = 'ttSection', valueKey = 'ttValue', datumKey = 'ttDatum';
+var Dataset = (function() {
+  var datasetKey = 'ttDataset', valueKey = 'ttValue', datumKey = 'ttDatum';
 
   // constructor
   // -----------
 
-  function Section(o) {
+  function Dataset(o) {
     o = o || {};
     o.templates = o.templates || {};
 
@@ -18,7 +18,7 @@ var Section = (function() {
       $.error('missing source');
     }
 
-    // tracks the last query the section was updated for
+    // tracks the last query the dataset was updated for
     this.query = null;
 
     this.highlight = !!o.highlight;
@@ -29,28 +29,28 @@ var Section = (function() {
 
     this.templates = getTemplates(o.templates, this.valueKey);
 
-    this.$el = $(html.section.replace('%CLASS%', this.name));
+    this.$el = $(html.dataset.replace('%CLASS%', this.name));
   }
 
   // static methods
   // --------------
 
-  Section.extractSectionName = function extractSectionName(el) {
-    return $(el).data(sectionKey);
+  Dataset.extractDatasetName = function extractDatasetName(el) {
+    return $(el).data(datasetKey);
   };
 
-  Section.extractValue = function extractDatum(el) {
+  Dataset.extractValue = function extractDatum(el) {
     return $(el).data(valueKey);
   };
 
-  Section.extractDatum = function extractDatum(el) {
+  Dataset.extractDatum = function extractDatum(el) {
     return $(el).data(datumKey);
   };
 
   // instance methods
   // ----------------
 
-  _.mixin(Section.prototype, EventEmitter, {
+  _.mixin(Dataset.prototype, EventEmitter, {
 
     // ### private
 
@@ -99,7 +99,7 @@ var Section = (function() {
           innerHtml = that.templates.suggestion(suggestion);
           outerHtml = html.suggestion.replace('%BODY%', innerHtml);
           $el = $(outerHtml)
-          .data(sectionKey, that.name)
+          .data(datasetKey, that.name)
           .data(valueKey, suggestion[that.valueKey])
           .data(datumKey, suggestion);
 
@@ -154,7 +154,7 @@ var Section = (function() {
     }
   });
 
-  return Section;
+  return Dataset;
 
   // helper functions
   // ----------------
diff --git a/src/typeahead/dropdown.js b/src/typeahead/dropdown.js
index 3c7c1bee..5ae8c4f2 100644
--- a/src/typeahead/dropdown.js
+++ b/src/typeahead/dropdown.js
@@ -16,14 +16,14 @@ var Dropdown = (function() {
     o = o || {};
 
     if (!o.menu) {
-      $.error('menu and/or sections are required');
+      $.error('menu is required');
     }
 
     this.isOpen = false;
     this.isEmpty = true;
     this.isMouseOverDropdown = false;
 
-    this.sections = _.map(o.sections, initializeSection);
+    this.datasets = _.map(o.datasets, initializeDataset);
 
     // bound functions
     onMouseEnter = _.bind(this._onMouseEnter, this);
@@ -39,9 +39,9 @@ var Dropdown = (function() {
     .on('mouseenter.tt', '.tt-suggestion', onSuggestionMouseEnter)
     .on('mouseleave.tt', '.tt-suggestion', onSuggestionMouseLeave);
 
-    _.each(this.sections, function(section) {
-      that.$menu.append(section.getRoot());
-      section.onSync('rendered', that._onRendered, that);
+    _.each(this.datasets, function(dataset) {
+      that.$menu.append(dataset.getRoot());
+      dataset.onSync('rendered', that._onRendered, that);
     });
   }
 
@@ -74,13 +74,13 @@ var Dropdown = (function() {
     },
 
     _onRendered: function onRendered() {
-      this.isEmpty = _.every(this.sections, isSectionEmpty);
+      this.isEmpty = _.every(this.datasets, isDatasetEmpty);
 
       this.isEmpty ? this._hide() : (this.isOpen && this._show());
 
-      this.trigger('sectionRendered');
+      this.trigger('datasetRendered');
 
-      function isSectionEmpty(section) { return section.isEmpty(); }
+      function isDatasetEmpty(dataset) { return dataset.isEmpty(); }
     },
 
     _hide: function() {
@@ -201,9 +201,9 @@ var Dropdown = (function() {
 
       if ($el.length) {
         datum = {
-          raw: Section.extractDatum($el),
-          value: Section.extractValue($el),
-          sectionName: Section.extractSectionName($el)
+          raw: Dataset.extractDatum($el),
+          value: Dataset.extractValue($el),
+          datasetName: Dataset.extractDatasetName($el)
         };
       }
 
@@ -219,15 +219,15 @@ var Dropdown = (function() {
     },
 
     update: function update(query) {
-      _.each(this.sections, updateSection);
+      _.each(this.datasets, updateDataset);
 
-      function updateSection(section) { section.update(query); }
+      function updateDataset(dataset) { dataset.update(query); }
     },
 
     empty: function empty() {
-      _.each(this.sections, clearSection);
+      _.each(this.datasets, clearDataset);
 
-      function clearSection(section) { section.clear(); }
+      function clearDataset(dataset) { dataset.clear(); }
     },
 
     isVisible: function isVisible() {
@@ -239,9 +239,9 @@ var Dropdown = (function() {
 
       this.$menu = null;
 
-      _.each(this.sections, destroySection);
+      _.each(this.datasets, destroyDataset);
 
-      function destroySection(section) { section.destroy(); }
+      function destroyDataset(dataset) { dataset.destroy(); }
     }
   });
 
@@ -250,7 +250,7 @@ var Dropdown = (function() {
   // helper functions
   // ----------------
 
-  function initializeSection(oSection) {
-    return new Section(oSection);
+  function initializeDataset(oDataset) {
+    return new Dataset(oDataset);
   }
 })();
diff --git a/src/typeahead/html.js b/src/typeahead/html.js
index 798315bb..6061cf36 100644
--- a/src/typeahead/html.js
+++ b/src/typeahead/html.js
@@ -7,7 +7,7 @@
 var html = {
   wrapper: '<span class="twitter-typeahead"></span>',
   dropdown: '<span class="tt-dropdown-menu"></span>',
-  section: '<div class="tt-section-%CLASS%"></div>',
+  dataset: '<div class="tt-dataset-%CLASS%"></div>',
   suggestions: '<span class="tt-suggestions"></span>',
   suggestion: '<div class="tt-suggestion">%BODY%</div>',
 };
diff --git a/src/typeahead/plugin.js b/src/typeahead/plugin.js
index abb56d27..f5c6b104 100644
--- a/src/typeahead/plugin.js
+++ b/src/typeahead/plugin.js
@@ -10,34 +10,55 @@
   typeaheadKey = 'ttTypeahead';
 
   methods = {
-    initialize: function initialize(o /*, splot of sections */) {
-      var sections = [].slice.call(arguments, 1);
+    initialize: function initialize(o /*, splot of datasets */) {
+      var datasets = [].slice.call(arguments, 1);
 
       o = o || {};
 
       return this.each(attach);
 
       function attach() {
-        var $input = $(this), typeahead;
+        var $input = $(this), promises, eventBus, typeahead;
+
+        promises = _.map(datasets, function(dataset) {
+          var promise = $.Deferred().resolve().promise();
 
-        _.each(sections, function(section) {
           // HACK: force highlight as a top-level config
-          section.highlight = !!o.highlight;
+          dataset.highlight = !!o.highlight;
 
           // if source is an object, convert it to a bloodhound
-          section.source = _.isObject(section.source) ?
-            bloodhoundAdapter(section.source).initialize() : section.source;
+          if (_.isObject(dataset.source)) {
+            dataset.source = bloodhoundAdapter(dataset.source);
+            promise = dataset.source.initialize();
+          }
+
+          return promise;
         });
 
+        eventBus = new EventBus({ el: $input });
+
         typeahead = new Typeahead({
           input: $input,
+          eventBus: eventBus,
           withHint: _.isUndefined(o.hint) ? true : !!o.hint,
           minLength: o.minLength,
           autoselect: o.autoselect,
-          sections: sections
+          datasets: datasets
         });
 
         $input.data(typeaheadKey, typeahead);
+
+        $.when.apply($, promises)
+        .done(trigger('initialized'))
+        .fail(trigger('initialized:err'));
+
+        // defer trigging of events to make it possible to attach
+        // a listener immediately after jQuery#typeahead is invoked
+        function trigger(eventName) {
+          return function() {
+          _.defer(function() { eventBus.trigger(eventName); });
+          };
+        }
       }
     },
 
@@ -114,10 +135,10 @@
 
   jQuery.fn.typeahead.bloodhoundAdapter = bloodhoundAdapter;
 
-  function bloodhoundAdapter() {
-    var source;
+  function bloodhoundAdapter(o) {
+    var bloodhound, source;
 
-    bloodhound = _.isObject(bloodhound) ? new Bloodhound(bloodhound) : bloodhound;
+    bloodhound = (o instanceof Bloodhound) ? o : new Bloodhound(o);
     source = _.bind(bloodhound.get, bloodhound);
 
     source.initialize = function() {
@@ -128,6 +149,7 @@
 
     source.add = function(data) {
       bloodhound.add();
+      return dataSource.initialize();
     };
 
     return source;
diff --git a/src/typeahead/typeahead.js b/src/typeahead/typeahead.js
index 94db7ad4..346a0a05 100644
--- a/src/typeahead/typeahead.js
+++ b/src/typeahead/typeahead.js
@@ -10,9 +10,9 @@ var Typeahead = (function() {
   // constructor
   // -----------
 
-  // THOUGHT: what if sections could dynamically be added/removed?
+  // THOUGHT: what if datasets could dynamically be added/removed?
   function Typeahead(o) {
-    var $menu, $input, $hint, sections;
+    var $menu, $input, $hint, datasets;
 
     o = o || {};
 
@@ -28,15 +28,15 @@ var Typeahead = (function() {
     $input = this.$node.find('.tt-input');
     $hint = this.$node.find('.tt-hint');
 
-    this.eventBus = new EventBus({ el: $input });
+    this.eventBus = o.eventBus || new EventBus({ el: $input });
 
-    this.dropdown = new Dropdown({ menu: $menu, sections: o.sections })
+    this.dropdown = new Dropdown({ menu: $menu, datasets: o.datasets })
     .onSync('suggestionClicked', this._onSuggestionClicked, this)
     .onSync('cursorMoved', this._onCursorMoved, this)
     .onSync('cursorRemoved', this._onCursorRemoved, this)
     .onSync('opened', this._onOpened, this)
     .onSync('closed', this._onClosed, this)
-    .onAsync('sectionRendered', this._onSectionRendered, this);
+    .onAsync('datasetRendered', this._onDatasetRendered, this);
 
     this.input = new Input({ input: $input, hint: $hint })
     .onSync('focused', this._onFocused, this)
@@ -86,7 +86,7 @@ var Typeahead = (function() {
       this.input.clearHint();
       this.input.setInputValue(datum.value, true);
 
-      this.eventBus.trigger('cursorchanged', datum.raw, datum.sectionName);
+      this.eventBus.trigger('cursorchanged', datum.raw, datum.datasetName);
     },
 
     _onCursorRemoved: function onCursorRemoved() {
@@ -94,7 +94,7 @@ var Typeahead = (function() {
       this._updateHint();
     },
 
-    _onSectionRendered: function onSectionRendered() {
+    _onDatasetRendered: function onDatasetRendered() {
       this._updateHint();
     },
 
@@ -236,7 +236,7 @@ var Typeahead = (function() {
         datum = this.dropdown.getDatumForTopSuggestion();
         datum && this.input.setInputValue(datum.value);
 
-        this.eventBus.trigger('autocompleted', datum.raw, datum.sectionName);
+        this.eventBus.trigger('autocompleted', datum.raw, datum.datasetName);
       }
     },
 
@@ -253,7 +253,7 @@ var Typeahead = (function() {
       // defer the closing of the dropdown otherwise it'll stay open
       _.defer(_.bind(this.dropdown.close, this.dropdown));
 
-      this.eventBus.trigger('selected', datum.raw, datum.sectionName);
+      this.eventBus.trigger('selected', datum.raw, datum.datasetName);
     },
 
     // ### public
diff --git a/test/section_view_spec.js b/test/dataset_view_spec.js
similarity index 61%
rename from test/section_view_spec.js
rename to test/dataset_view_spec.js
index 80c2ec08..cfb5c24f 100644
--- a/test/section_view_spec.js
+++ b/test/dataset_view_spec.js
@@ -1,7 +1,7 @@
-describe('Section', function() {
+describe('Dataset', function() {
 
   beforeEach(function() {
-    this.section = new Section({
+    this.dataset = new Dataset({
       name: 'test',
       source: this.source = jasmine.createSpy('source')
     });
@@ -10,27 +10,27 @@ describe('Section', function() {
   it('should throw an error if source is missing', function() {
     expect(noSource).toThrow();
 
-    function noSource() { new Section(); }
+    function noSource() { new Dataset(); }
   });
 
   describe('#getRoot', function() {
     it('should return the root element', function() {
-      expect(this.section.getRoot()).toBe('div.tt-section-test');
+      expect(this.dataset.getRoot()).toBe('div.tt-dataset-test');
     });
   });
 
   describe('#update', function() {
     it('should render suggestions', function() {
       this.source.andCallFake(fakeGetWithSyncResults);
-      this.section.update('woah');
+      this.dataset.update('woah');
 
-      expect(this.section.getRoot()).toContainText('one');
-      expect(this.section.getRoot()).toContainText('two');
-      expect(this.section.getRoot()).toContainText('three');
+      expect(this.dataset.getRoot()).toContainText('one');
+      expect(this.dataset.getRoot()).toContainText('two');
+      expect(this.dataset.getRoot()).toContainText('three');
     });
 
     it('should render empty when no suggestions are available', function() {
-      this.section = new Section({
+      this.dataset = new Dataset({
         source: this.source,
         templates: {
           empty: '<h2>empty</h2>'
@@ -38,13 +38,13 @@ describe('Section', function() {
       });
 
       this.source.andCallFake(fakeGetWithSyncEmptyResults);
-      this.section.update('woah');
+      this.dataset.update('woah');
 
-      expect(this.section.getRoot()).toContainText('empty');
+      expect(this.dataset.getRoot()).toContainText('empty');
     });
 
     it('should render header', function() {
-      this.section = new Section({
+      this.dataset = new Dataset({
         source: this.source,
         templates: {
           header: '<h2>header</h2>'
@@ -52,13 +52,13 @@ describe('Section', function() {
       });
 
       this.source.andCallFake(fakeGetWithSyncResults);
-      this.section.update('woah');
+      this.dataset.update('woah');
 
-      expect(this.section.getRoot()).toContainText('header');
+      expect(this.dataset.getRoot()).toContainText('header');
     });
 
     it('should render footer', function() {
-      this.section = new Section({
+      this.dataset = new Dataset({
         source: this.source,
         templates: {
           footer: function(c) { return '<p>' + c.query + '</p>'; }
@@ -66,13 +66,13 @@ describe('Section', function() {
       });
 
       this.source.andCallFake(fakeGetWithSyncResults);
-      this.section.update('woah');
+      this.dataset.update('woah');
 
-      expect(this.section.getRoot()).toContainText('woah');
+      expect(this.dataset.getRoot()).toContainText('woah');
     });
 
     it('should not render header/footer if there is no content', function() {
-      this.section = new Section({
+      this.dataset = new Dataset({
         source: this.source,
         templates: {
           header: '<h2>header</h2>',
@@ -81,37 +81,37 @@ describe('Section', function() {
       });
 
       this.source.andCallFake(fakeGetWithSyncEmptyResults);
-      this.section.update('woah');
+      this.dataset.update('woah');
 
-      expect(this.section.getRoot()).not.toContainText('header');
-      expect(this.section.getRoot()).not.toContainText('footer');
+      expect(this.dataset.getRoot()).not.toContainText('header');
+      expect(this.dataset.getRoot()).not.toContainText('footer');
     });
 
     it('should not render stale suggestions', function() {
       this.source.andCallFake(fakeGetWithAsyncResults);
-      this.section.update('woah');
+      this.dataset.update('woah');
 
       this.source.andCallFake(fakeGetWithSyncResults);
-      this.section.update('nelly');
+      this.dataset.update('nelly');
 
       waits(100);
 
       runs(function() {
-        expect(this.section.getRoot()).toContainText('one');
-        expect(this.section.getRoot()).toContainText('two');
-        expect(this.section.getRoot()).toContainText('three');
-        expect(this.section.getRoot()).not.toContainText('four');
-        expect(this.section.getRoot()).not.toContainText('five');
+        expect(this.dataset.getRoot()).toContainText('one');
+        expect(this.dataset.getRoot()).toContainText('two');
+        expect(this.dataset.getRoot()).toContainText('three');
+        expect(this.dataset.getRoot()).not.toContainText('four');
+        expect(this.dataset.getRoot()).not.toContainText('five');
       });
     });
 
     it('should trigger rendered after suggestions are rendered', function() {
       var spy;
 
-      this.section.onSync('rendered', spy = jasmine.createSpy());
+      this.dataset.onSync('rendered', spy = jasmine.createSpy());
 
       this.source.andCallFake(fakeGetWithSyncResults);
-      this.section.update('woah');
+      this.dataset.update('woah');
 
       waitsFor(function() { return spy.callCount; });
     });
@@ -120,31 +120,31 @@ describe('Section', function() {
   describe('#clear', function() {
     it('should clear suggestions', function() {
       this.source.andCallFake(fakeGetWithSyncResults);
-      this.section.update('woah');
+      this.dataset.update('woah');
 
-      this.section.clear();
-      expect(this.section.getRoot()).toBeEmpty();
+      this.dataset.clear();
+      expect(this.dataset.getRoot()).toBeEmpty();
     });
   });
 
   describe('#isEmpty', function() {
     it('should return true when empty', function() {
-      expect(this.section.isEmpty()).toBe(true);
+      expect(this.dataset.isEmpty()).toBe(true);
     });
 
     it('should return false when not empty', function() {
       this.source.andCallFake(fakeGetWithSyncResults);
-      this.section.update('woah');
+      this.dataset.update('woah');
 
-      expect(this.section.isEmpty()).toBe(false);
+      expect(this.dataset.isEmpty()).toBe(false);
     });
   });
 
   describe('#destroy', function() {
-    it('should null out the reference to the section element', function() {
-      this.section.destroy();
+    it('should null out the reference to the dataset element', function() {
+      this.dataset.destroy();
 
-      expect(this.section.$el).toBeNull();
+      expect(this.dataset.$el).toBeNull();
     });
   });
 
diff --git a/test/dropdown_view_spec.js b/test/dropdown_view_spec.js
index 2b0cb07b..71f8b3ef 100644
--- a/test/dropdown_view_spec.js
+++ b/test/dropdown_view_spec.js
@@ -3,24 +3,24 @@ describe('Dropdown', function() {
   beforeEach(function() {
     var $fixture;
 
-    jasmine.Section.useMock();
+    jasmine.Dataset.useMock();
 
     setFixtures(fixtures.html.menu);
 
     $fixture = $('#jasmine-fixtures');
     this.$menu = $fixture.find('.tt-dropdown-menu');
-    this.$menu.html(fixtures.html.section);
+    this.$menu.html(fixtures.html.dataset);
 
-    this.view = new Dropdown({ menu: this.$menu, sections: [{}] });
-    this.section = this.view.sections[0];
+    this.view = new Dropdown({ menu: this.$menu, datasets: [{}] });
+    this.dataset = this.view.datasets[0];
   });
 
-  it('should throw an error if menu and/or sections is missing', function() {
+  it('should throw an error if menu and/or datasets is missing', function() {
     expect(noMenu).toThrow();
-    expect(noSections).toThrow();
+    expect(noDatasets).toThrow();
 
     function noMenu() { new Dropdown({ menu: '.menu' }); }
-    function noSections() { new Dropdown({ sections: true }); }
+    function noDatasets() { new Dropdown({ datasets: true }); }
   });
 
   describe('when mouseenter is triggered', function() {
@@ -95,32 +95,32 @@ describe('Dropdown', function() {
     });
   });
 
-  describe('when rendered is triggered on a section', function() {
+  describe('when rendered is triggered on a dataset', function() {
     it('should hide the dropdown if empty', function() {
-      this.section.isEmpty.andReturn(true);
+      this.dataset.isEmpty.andReturn(true);
 
       this.view.open();
       this.view._show();
-      this.section.trigger('rendered');
+      this.dataset.trigger('rendered');
 
       expect(this.$menu).not.toBeVisible();
     });
 
     it('should show the dropdown if not empty', function() {
-      this.section.isEmpty.andReturn(false);
+      this.dataset.isEmpty.andReturn(false);
 
       this.view.open();
       this.view._hide();
-      this.section.trigger('rendered');
+      this.dataset.trigger('rendered');
 
       expect(this.$menu).toBeVisible();
     });
 
-    it('should trigger sectionRendered', function() {
+    it('should trigger datasetRendered', function() {
       var spy;
 
-      this.view.onSync('sectionRendered', spy = jasmine.createSpy());
-      this.section.trigger('rendered');
+      this.view.onSync('datasetRendered', spy = jasmine.createSpy());
+      this.dataset.trigger('rendered');
 
       expect(spy).toHaveBeenCalled();
     });
@@ -304,16 +304,16 @@ describe('Dropdown', function() {
   });
 
   describe('#update', function() {
-    it('should invoke update on each section', function() {
+    it('should invoke update on each dataset', function() {
       this.view.update();
-      expect(this.section.update).toHaveBeenCalled();
+      expect(this.dataset.update).toHaveBeenCalled();
     });
   });
 
   describe('#empty', function() {
-    it('should invoke clear on each section', function() {
+    it('should invoke clear on each dataset', function() {
       this.view.empty();
-      expect(this.section.clear).toHaveBeenCalled();
+      expect(this.dataset.clear).toHaveBeenCalled();
     });
   });
 
@@ -352,10 +352,10 @@ describe('Dropdown', function() {
       expect($menu.off).toHaveBeenCalledWith('.tt');
     });
 
-    it('should destroy its sections', function() {
+    it('should destroy its datasets', function() {
       this.view.destroy();
 
-      expect(this.section.destroy).toHaveBeenCalled();
+      expect(this.dataset.destroy).toHaveBeenCalled();
     });
 
     it('should null out its reference to the menu element', function() {
diff --git a/test/fixtures/html.js b/test/fixtures/html.js
index f1f482d4..3b4a284d 100644
--- a/test/fixtures/html.js
+++ b/test/fixtures/html.js
@@ -5,8 +5,8 @@ fixtures.html = {
   input: '<input class="tt-input" type="text" autocomplete="false" spellcheck="false">',
   hint: '<input class="tt-hint" type="text" autocomplete="false" spellcheck="false" disabled>',
   menu: '<span class="tt-dropdown-menu"></span>',
-  section: [
-    '<div class="tt-section-test">',
+  dataset: [
+    '<div class="tt-dataset-test">',
       '<span class="tt-suggestions">',
         '<div class="tt-suggestion"><p>one</p></div>',
         '<div class="tt-suggestion"><p>two</p></div>',
diff --git a/test/helpers/typeahead_mocks.js b/test/helpers/typeahead_mocks.js
index 1c8ea64a..4df2529d 100644
--- a/test/helpers/typeahead_mocks.js
+++ b/test/helpers/typeahead_mocks.js
@@ -7,7 +7,7 @@
     'Transport',
     'SearchIndex',
     'Input',
-    'Section',
+    'Dataset',
     'Dropdown'
     ];
 
diff --git a/test/playground.html b/test/playground.html
index d45047ea..98589891 100644
--- a/test/playground.html
+++ b/test/playground.html
@@ -175,6 +175,7 @@
 
       $('input').on([
         'typeahead:initialized',
+        'typeahead:initialized:err',
         'typeahead:selected',
         'typeahead:autocompleted',
         'typeahead:cursorchanged',
diff --git a/test/typeahead_view_spec.js b/test/typeahead_view_spec.js
index 1ac22a26..8a1da234 100644
--- a/test/typeahead_view_spec.js
+++ b/test/typeahead_view_spec.js
@@ -5,7 +5,7 @@ describe('Typeahead', function() {
     var $fixture, $input;
 
     jasmine.Input.useMock();
-    jasmine.Section.useMock();
+    jasmine.Dataset.useMock();
     jasmine.Dropdown.useMock();
 
     setFixtures(fixtures.html.textInput);
@@ -18,7 +18,7 @@ describe('Typeahead', function() {
     this.view = new Typeahead({
       input: this.$input,
       withHint: true,
-      sections: {}
+      datasets: {}
     });
 
     this.input = this.view.input;
@@ -94,14 +94,14 @@ describe('Typeahead', function() {
     });
   });
 
-  describe('when dropdown triggers sectionRendered', function() {
+  describe('when dropdown triggers datasetRendered', function() {
     it('should update the hint asynchronously', function() {
       this.dropdown.getDatumForTopSuggestion.andReturn(testDatum);
       this.dropdown.isVisible.andReturn(true);
       this.input.hasOverflow.andReturn(false);
       this.input.getInputValue.andReturn(testDatum.value.slice(0, 2));
 
-      this.dropdown.trigger('sectionRendered');
+      this.dropdown.trigger('datasetRendered');
 
       waitsFor(function() {
         return !!this.input.setHintValue.callCount;

From 561ef555888035eb596092a9686b403dcbc44a5d Mon Sep 17 00:00:00 2001
From: Jake Harding <jharding@twitter.com>
Date: Mon, 30 Dec 2013 09:26:44 -0800
Subject: [PATCH 05/17] Support bloodhound instances and update README.

---
 README.md                    | 206 +++++++++++++++++++----------------
 src/bloodhound/bloodhound.js |   2 +-
 src/typeahead/plugin.js      |  46 ++++----
 3 files changed, 141 insertions(+), 113 deletions(-)

diff --git a/README.md b/README.md
index ffa7c89f..4afce6c7 100644
--- a/README.md
+++ b/README.md
@@ -7,12 +7,12 @@ Inspired by [twitter.com]'s autocomplete search functionality, typeahead.js is
 a flexible JavaScript library that provides a strong foundation for building 
 robust typeaheads.
 
-The typeahead.js library is built on top of 2 components: the data component,
-[dataset](#dataset), and the UI component, [typeahead](#typeahead). Datasets are 
-responsible for providing suggestions for a given query. Typeaheads are 
-responsible for rendering suggestions and handling DOM interactions. Both
-components can be used separately, but when used together, they provided a rich
-typeahead experience.
+The typeahead.js library consists of 2 components: the suggestion engine, 
+[Bloodhound](#bloodhound), and the UI view, [Typeahead](#typeahead). 
+The suggestion engine is responsible for computing suggestions for a given 
+query. The UI view is responsible for rendering suggestions and handling DOM 
+interactions. Both components can be used separately, but when used together, 
+they can provided a rich typeahead experience.
 
 <!-- section links -->
 
@@ -30,18 +30,19 @@ Preferred method:
 Other methods:
 * [Download zipball of latest release][zipball].
 * Download the latest dist files individually:
-  * *[dataset.js]*
-  * *[typeahead.js]*
-  * *[typeahead.bundle.js]* (dataset + typeahead)
+  * *[bloodhound.js]* (standalone suggestion engine)
+  * *[typeahead.js]* (standalone UI view)
+  * *[typeahead.bundle.js]* (*bloodhound.js* + *typeahead.js*)
   * *[typeahead.bundle.min.js]*
 
-**Note:** both dataset.js and typeahead.js have a dependency on [jQuery] 1.9+.
+**Note:** both *bloodhound.js* and *typeahead.js* have a dependency on 
+[jQuery] 1.9+.
 
 <!-- section links -->
 
 [Bower]: http://bower.io/
 [zipball]: http://twitter.github.com/typeahead.js/releases/latest/typeahead.js.zip
-[dataset.js]: http://twitter.github.com/typeahead.js/releases/latest/dataset.js
+[bloodhound.js]: http://twitter.github.com/typeahead.js/releases/latest/bloodhound.js
 [typeahead.js]: http://twitter.github.com/typeahead.js/releases/latest/typeahead.js
 [typeahead.bundle.js]: http://twitter.github.com/typeahead.js/releases/latest/typeahead.bundle.js
 [typeahead.bundle.min.js]: http://twitter.github.com/typeahead.js/releases/latest/typeahead.bundle.min.js
@@ -55,12 +56,12 @@ Table of Contents
 * [Typeahead](#typeahead)
   * [API](#typeahead-api)
   * [Options](#typeahead-options)
-  * [Sections](#sections)
+  * [Datasets](#datasets)
   * [Custom Events](#custom-events)
   * [Look and Feel](#look-and-feel)
-* [Dataset](#dataset)
-  * [API](#dataset-api)
-  * [Options](#dataset-options)
+* [Bloodhound](#bloodhound)
+  * [API](#bloodhound-api)
+  * [Options](#bloodhound-options)
   * [Prefetch](#prefetch)
   * [Remote](#remote)
   * [Tokens](#tokens)
@@ -86,7 +87,7 @@ Features
 * Highlights query matches within the suggestion
 * Triggers custom events
 
-**Dataset**
+**Bloodhound**
 
 * Works with hardcoded data
 * Prefetches data on initialization to reduce suggestion latency
@@ -97,7 +98,7 @@ Features
 Examples
 --------
 
-For some working examples of typeahead.js, visit our [examples page].
+For some working examples of typeahead.js, visit the [examples page].
 
 <!-- section links -->
 
@@ -112,14 +113,13 @@ interactions.
 
 ### Typeahead API
 
-#### jQuery#typeahead(options, [\*sections])
+#### jQuery#typeahead(options, [\*datasets])
 
 Turns any `input[type="text"]` element into a typeahead. `options` is an 
-options hash that's used to configure the typeahead to your liking.  For more
-info about what options are available, check out the 
-[Options](#typeahead-options) section. Subsequent arguments (`\*sections`), are
-individual option hashes for sections. Refer to [Sections](#sections) for more 
-info.
+options hash that's used to configure the typeahead to your liking.
+[Typeahead Options](#typeahead-options) goes over the available configs. 
+Subsequent arguments (`\*datasets`), are individual option hashes for datasets. 
+For more details regarding datasets, refer to [Datasets](#datasets).
 
 ```javascript
 $('.typeahead').typeahead({
@@ -136,8 +136,8 @@ $('.typeahead').typeahead({
 
 #### jQuery#typeahead('destroy')
 
-Removes typeahead.js functionality and reverts the `input` element back to how 
-it was before it was turned into a typeahead.
+Removes typeahead functionality and reverts the `input` element back to its 
+original state.
 
 ```javascript
 $('.typeahead').typeahead('destroy');
@@ -146,7 +146,7 @@ $('.typeahead').typeahead('destroy');
 #### jQuery#typeahead('open')
 
 Opens the dropdown menu of typeahead. Note that being open does not mean that
-the menu is visible. The menu is only visible when it is open and not empty.
+the menu is visible. The menu is only visible when it is open and has content.
 
 ```javascript
 $('.typeahead').typeahead('open');
@@ -181,8 +181,9 @@ $('.typeahead').typeahead('val', myVal);
 
 When initializing a typeahead, there are a number of options you can configure.
 
-* `autoselect` – If `true`, when the dropdown menu is open and the user hits 
-  enter, the top suggestion will be selected. Defaults to `false`.
+* `autoselect` – If `true`, defaults the suggestion selection to the top 
+  suggestion when the user keys enter while the dropdown menu is open. Defaults
+  to `false`.
 
 * `highlight` – If `true`, when suggestions are rendered, pattern matches
   for the current query in text nodes will be wrapped in a `strong` element. 
@@ -191,49 +192,58 @@ When initializing a typeahead, there are a number of options you can configure.
 * `hint` – If `false`, the typeahead will not show a hint. Defaults to `true`.
 
 * `minLength` – The minimum character length needed before suggestions start 
-  getting renderd. Defaults to `1`.
+  getting rendered. Defaults to `1`.
 
-### Sections
+### Dataset
 
-A typeahead is composed of one or more sections. For simple use cases, one 
-section will usually suffice. If however you wanted to build something like
-the search typeahead on twitter.com, you'd need multiple sections.
+A typeahead is composed of one or more datasets. For simple use cases, one 
+dataset will usually suffice. If however you wanted to build something like
+the search typeahead on twitter.com, you'd need multiple datasets.
 
-Sections can be configured using the following options.
+Datasets can be configured using the following options.
 
-* `name` – The name of the section. This will be prepened to `tt-section-` to 
-  form the class name of the containging DOM element. Defaults to a random 
+* `name` – The name of the dataset. This will be prepended to `tt-dataset-` to 
+  form the class name of the containing DOM element. Defaults to a random 
   number.
 
-* `source` – The backing data source for the section. Can be either a function
-  with the signature `(query, cb)` or a 
-  [dataset options hash](#dataset-options). If the former, it is expected `cb` 
-  will be invoked with an array of [datums](#datums) that are a match for 
-  `query`. If the latter, a dataset will be constructed and initialized and 
-  that will be used as the backing data source. **Required**.
+* `source` – The backing data source that provides suggestions. Expected to be 
+  either an [options hash for a bloodhound](#bloodhound-options), an instance
+  of a Bloodhoud, or a function with the signature `(query, cb)`. If the last
+  option is used, it is expected that the function will compute the suggestion 
+  set for `query`, convert the suggestions to an array of [datums](#datums), 
+  and then invoke `cb` with that array as the first and only argument.
+  
+  that `cb` will be invoked with an array of 
+  [datums](#datums) that are a match for `query`. **Required**.
 
-* `templates` – A hash of templates to be used when rendering the section.
+* `templates` – A hash of templates to be used when rendering the dataset.
 
   * `empty` – Rendered when `0` suggestions are available for the given query. 
   Can be either a HTML string or a precompiled template. If it's a precompiled
   template, the passed in context will contain `query`.
 
-  * `footer`– Rendered at the bottom of the section. Can be either a HTML 
+  * `footer`– Rendered at the bottom of the dataset. Can be either a HTML 
   string or a precompiled template. If it's a precompiled template, the passed 
   in context will contain `query` and `isEmpty`.
 
-  * `header` – Rendered at the top of the section. Can be either a HTML string 
+  * `header` – Rendered at the top of the dataset. Can be either a HTML string 
   or a precompiled template. If it's a precompiled template, the passed in 
   context will contain `query` and `isEmpty`.
 
   * `suggestion` – Used to render a single suggestion. If set, this has to be a 
-  precompiled tempate. The associated datum object will serves as the context. 
-  Defaults to the value of the datum wrapped in a `p` tag.
+  precompiled template. The associated datum object will serves as the context. 
+  Defaults to the value of the datum wrapped in a `p` tag i.e. 
+  `<p>{{query}}</p>`.
 
 ### Custom Events
 
 The typeahead component triggers the following custom events.
 
+* `typeahead:initialized` – Triggered after the source of each dataset has
+  been initialized. Note, for non-bloodhound sources, initialization cannot
+  be detected so those sources are ignored i.e. if you use all non-bloodhound
+  sources, this event will be triggered right away.
+
 * `typeahead:opened` – Triggered when the dropdown menu of a typeahead is 
   opened.
 
@@ -243,16 +253,16 @@ The typeahead component triggers the following custom events.
 * `typeahead:cursorchanged` – Triggered when the dropdown menu cursor is moved
   to a different suggestion. The datum for the suggestion that the cursor was
   moved to is passed to the event handler as an argument in addition to the name 
-  of the section it belongs to.
+  of the dataset it belongs to.
 
 * `typeahead:selected` – Triggered when a suggestion from the dropdown menu is 
   selected. The datum for the selected suggestion is passed to the event handler 
-  as an argument in addition to the name of the section it belongs to.
+  as an argument in addition to the name of the dataset it belongs to.
 
 * `typeahead:autocompleted` – Triggered when the query is autocompleted. 
   Autocompleted means the query was changed to the hint. The datum used for 
   autocompletion is passed to the event handler as an argument in addition to 
-  the name of the section it belongs to.
+  the name of the dataset it belongs to.
 
 All custom events are triggered on the element initialized as a typeahead.
 
@@ -260,12 +270,12 @@ All custom events are triggered on the element initialized as a typeahead.
 
 Below is a faux mustache template describing the DOM structure of a typeahead 
 dropdown menu. Keep in mind that `header`, `footer`, `suggestion`, and `empty` 
-come from the templates mentioned [here](#sections). 
+come from the provided templates detailed [here](#datasets). 
 
 ```html
 <span class="tt-dropdown-menu">
-  {{#sections}}
-    <div class="tt-section-{{name}}">
+  {{#datasets}}
+    <div class="tt-dataset-{{name}}">
       {{{header}}}
       <span class="tt-suggestions">
         {{#suggestions}}
@@ -277,7 +287,7 @@ come from the templates mentioned [here](#sections).
       </span>
       {{{footer}}}
     </div>
-  {{/sections}}
+  {{/datasets}}
 </span>
 ```
 
@@ -285,71 +295,80 @@ When an end-user mouses or keys over a `.tt-suggestion`, the class `tt-cursor`
 will be added to it. You can use this class as a hook for styling the "under 
 cursor" state of suggestions.
 
-Dataset
--------
+Bloodhound
+----------
 
-Datasets are the data component that is responsible for computing a suggestion
-set for a given query. They're robust, flexible, and offer advanced 
+Bloodhounds are the data components responsible for computing a set of
+suggestions for a given query. They're robust, flexible, and offer advanced 
 functionality such as prefetching, intelligent caching, fast lookups, and 
 backfilling with remote data.
 
-### Dataset API
+### Bloodhound API
 
 #### Constructor
 
-The constructor function. It takes an [options hash](#dataset-options).
+The constructor function. It takes an [options hash](#bloodhound-options).
 
 ```javascript
-var dataset = new Dataset({
-  name: myDatasetName,
+var bloodhound = new Bloodhound({
+  name: 'animals',
   local: ['dog', 'pig', 'moose'],
   remote: 'http://example.com/animals?q=%QUERY'
 });
 ```
 
-#### Dataset#initialize()
+#### Bloodhound#initialize()
 
-Kicks off the initialization of the dataset. This includes processing the data
-provided through `local` and fetching and processing the data provided by 
-`prefetch`. `Dataset#get` and `Dataset#add` will be useless until this method
-is called.
+Kicks off the initialization of the bloodhound. This includes processing the 
+data provided through `local` and fetching and processing the data provided by 
+`prefetch`. `Bloodhound#get` will be useless until the bloodhound has been
+intialized. Returns a [jQuery promise] which is resolved when the fetching and 
+processing has finished.
 
 ```javascript
-dataset.initialize();
+bloodhound.initialize();
 ```
 
-#### Dataset#get(query, cb)
+<!-- section links -->
+
+[jQuery promise]: http://api.jquery.com/Types/#Promise
+
+#### Bloodhound#get(query, cb)
 
-Retrieves datums from the dataset matching  `query` and invokes `cb` with 
+Retrieves datums from the data source matching `query` and invokes `cb` with 
 them. `cb` will always be called at least once with the mixed results from
 `local` and `prefetch`. If those results are insufficent, `cb` will be called 
 again later with the mixed results from `local`, `prefetch`, **and** `remote`.
 
 ```javascript
-dataset.get(myQuery, function(suggestions) {
+bloodhound.get(myQuery, function(suggestions) {
   suggestions.each(function(suggestion) {
     console.log(suggestion.value);
   });
 });
 ```
 
-### Dataset Options
+### Bloodhound Options
 
-When initializing a dataset, there are a number of options you can configure.
+When initializing a Bloodhound, there are a number of options you can 
+configure.
 
 * `valueKey` – The key used to access the value of the datum in the datum 
   object. Defaults to `value`.
 
-* `limit` – The max number of suggestions to return from `Dataset#get`. If not
-  reached, the dataset will attempt to backfill the suggestions from `remote`.
+* `limit` – The max number of suggestions to return from `Bloodhound#get`. If 
+  not reached, the data source will attempt to backfill the suggestions from 
+  `remote`.
 
 * `tokenizer` – A function with the signature `(str)` that returns an array of
   tokens. The default implementation of `tokenizer` splits `str` on whitespace.
 
-* `dupChecker` – A function with the signature `(datum1, datum2)` that returns
-  `true` if the datums are duplicates or `false` otherwise. If `dupChecker` is
-  `true`, a function that compares value properties will be used. This is used 
-  for making sure no duplicate suggestions are introduced from `remote`.
+* `dupDetector` – This is used for making sure no duplicate suggestions are 
+  introduced from `remote`. Expected to be either `true`, `false`, or a 
+  function with the signature `(datum1, datum2)` that returns `true` if the 
+  datums are duplicates or `false` otherwise. If set to `true`, a function that 
+  compares value properties will be used. If set to `false`, duplicate 
+  detection will not be performed.
 
 * `sorter` – A [compare function] used to sort matched datums for a given query.
 
@@ -376,8 +395,8 @@ When configuring `prefetch`, the following options are available.
 
 * `url` – A URL to a JSON file containing an array of datums. **Required.**
 
-* `cacheKey` – The key data will be stored in local storage under. Defaults to 
-  `url`.
+* `cacheKey` – The key that data will be stored in local storage under. 
+  Defaults to `url`.
 
 * `ttl` – The time (in milliseconds) the prefetched data should be cached in 
   local storage. Defaults to `86400000` (1 day).
@@ -411,7 +430,7 @@ When configuring `remote`, the following options are available.
 
 * `replace` – A function with the signature `replace(url, query)` that can be 
   used to override the request URL. Expected to return a valid URL. If set, no 
-  wildcard substitution will be performed on `url`.
+  `wildcard` substitution will be performed on `url`.
 
 * `rateLimitBy` – The method used to rate-limit network requests. Can be either 
   `debounce` or `throttle`. Defaults to `debounce`.
@@ -427,18 +446,18 @@ When configuring `remote`, the following options are available.
 
 <!-- section links -->
 
-[ajax settings object]:http://api.jquery.com/jQuery.ajax/#jQuery-ajax-settings
+[ajax settings object]: http://api.jquery.com/jQuery.ajax/#jQuery-ajax-settings
 
 ### Tokens
 
-The algorithm used by datasets for providing suggestions for a given query is
-token-based. When `Dataset#get` is called, it tokenizes `query` using 
+The algorithm used by bloodhounds for providing suggestions for a given query 
+is token-based. When `Bloodhound#get` is called, it tokenizes `query` using 
 `tokenizer` and then invokes `cb` with all of the datums that contain those 
 tokens.
 
-By default, a dataset will generate tokens for a datum by tokenizing its value.
-However, it is possible to explicitly set the tokens for a datum by including a
-`tokens` property.
+By default, a bloodhound will generate tokens for a datum by tokenizing its 
+value. However, it is possible to explicitly set the tokens for a datum by 
+including a `tokens` property.
 
 ```javascript
 {
@@ -452,19 +471,20 @@ The above datum would be a valid suggestion for queries such as:
 * `typehead`
 * `typehead.js`
 * `autoco`
-* `javascript type`
+* `java type`
 
 Datum
 -----
 
 The data representation of a suggestion is referred to as a datum. A datum is
 an object that can contain arbitrary properties. When a suggestion is 
-rendered, its datum will be the context passed the suggestion template.
+rendered, its datum will be the context passed the precompiled suggestion 
+template.
 
 Datums are expected to contain a value property – when a suggestion is 
 selected, this will be what the value of the `input` is set to. By default,
 it's expected the name of this property will be `value`, but it's configurable.
-See [Dataset](#dataset) for more details.
+See [Bloodhound Options](#bloodhound-options) for more details.
 
 For ease of use, datums can also be represented as a string. Strings found in 
 place of datum objects are implicitly converted to an object with its value
@@ -483,7 +503,6 @@ typeahead. The value property here is `handle` and the datum contains additional
 properties to make it possible to render richer suggestions. This datum also
 explicitly sets its [tokens](#tokens).
 
-
 ```javascript
 {
   name: 'Jake Harding',
@@ -526,7 +545,8 @@ https://github.com/twitter/typeahead.js/issues
 Versioning
 ----------
 
-For transparency and insight into our release cycle, releases will be numbered with the follow format:
+For transparency and insight into our release cycle, releases will be numbered 
+with the follow format:
 
 `<major>.<minor>.<patch>`
 
diff --git a/src/bloodhound/bloodhound.js b/src/bloodhound/bloodhound.js
index 3c5dcbd0..bb25ab2d 100644
--- a/src/bloodhound/bloodhound.js
+++ b/src/bloodhound/bloodhound.js
@@ -4,7 +4,7 @@
  * Copyright 2013 Twitter, Inc. and other contributors; Licensed MIT
  */
 
-var Bloodhound = (function() {
+var Bloodhound = window.Bloodhound = (function() {
   var keys;
 
   keys = { data: 'data', protocol: 'protocol', thumbprint: 'thumbprint' };
diff --git a/src/typeahead/plugin.js b/src/typeahead/plugin.js
index f5c6b104..10f73d52 100644
--- a/src/typeahead/plugin.js
+++ b/src/typeahead/plugin.js
@@ -4,7 +4,7 @@
  * Copyright 2013 Twitter, Inc. and other contributors; Licensed MIT
  */
 
-(function() {
+(function(Bloodhound) {
   var typeaheadKey, methods;
 
   typeaheadKey = 'ttTypeahead';
@@ -20,26 +20,24 @@
       function attach() {
         var $input = $(this), promises, eventBus, typeahead;
 
-        promises = _.map(datasets, function(dataset) {
-          var promise = $.Deferred().resolve().promise();
+        promises = _.map(datasets, function(d) {
+          var promise = $.Deferred().resolve();
 
           // HACK: force highlight as a top-level config
-          dataset.highlight = !!o.highlight;
+          d.highlight = !!o.highlight;
 
           // if source is an object, convert it to a bloodhound
-          if (_.isObject(dataset.source)) {
-            dataset.source = bloodhoundAdapter(dataset.source);
-            promise = dataset.source.initialize();
+          if (_.isObject(d.source) || isBloodhound(d.source)) {
+            d.source = bloodhoundAdapter(d.source);
+            promise = d.source.initialize();
           }
 
           return promise;
         });
 
-        eventBus = new EventBus({ el: $input });
-
         typeahead = new Typeahead({
           input: $input,
-          eventBus: eventBus,
+          eventBus: eventBus = new EventBus({ el: $input }),
           withHint: _.isUndefined(o.hint) ? true : !!o.hint,
           minLength: o.minLength,
           autoselect: o.autoselect,
@@ -48,9 +46,13 @@
 
         $input.data(typeaheadKey, typeahead);
 
-        $.when.apply($, promises)
-        .done(trigger('initialized'))
-        .fail(trigger('initialized:err'));
+        // only trigger these events if at least one dataset is
+        // using a bloodhound as a source
+        if (promises.length) {
+          $.when.apply($, promises)
+          .done(trigger('initialized'))
+          .fail(trigger('initialized:err'));
+        }
 
         // defer trigging of events to make it possible to attach
         // a listener immediately after jQuery#typeahead is invoked
@@ -133,25 +135,31 @@
     }
   };
 
-  jQuery.fn.typeahead.bloodhoundAdapter = bloodhoundAdapter;
+  // helper functions
+  // ----------------
 
   function bloodhoundAdapter(o) {
     var bloodhound, source;
 
-    bloodhound = (o instanceof Bloodhound) ? o : new Bloodhound(o);
+    if (!Bloodhound) {
+      $.error('Bloodhound constructor has not been loaded');
+    }
+
+    bloodhound = isBloodhound(o) ? o : new Bloodhound(o);
     source = _.bind(bloodhound.get, bloodhound);
 
     source.initialize = function() {
-      // returns a promise that is resolved after prefetch data
-      // is loaded and processed
       return bloodhound.initialize();
     };
 
     source.add = function(data) {
       bloodhound.add();
-      return dataSource.initialize();
     };
 
     return source;
   };
-})();
+
+  function isBloodhound(obj) {
+    return Bloodhound && obj instanceof Bloodhound;
+  }
+})(window.Bloodhound);

From efc6c1bc18c915cb303874f45f68acb979eaf1ca Mon Sep 17 00:00:00 2001
From: Jake Harding <jharding@twitter.com>
Date: Mon, 30 Dec 2013 09:32:31 -0800
Subject: [PATCH 06/17] Add grunt badge to README.

---
 README.md | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 4afce6c7..8e407916 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
 [![build status](https://secure.travis-ci.org/twitter/typeahead.js.png?branch=master)](http://travis-ci.org/twitter/typeahead.js)
+[![Built with Grunt](https://cdn.gruntjs.com/builtwith.png)](http://gruntjs.com/)
+
 
 [typeahead.js][gh-page]
 =======================
@@ -118,7 +120,7 @@ interactions.
 Turns any `input[type="text"]` element into a typeahead. `options` is an 
 options hash that's used to configure the typeahead to your liking.
 [Typeahead Options](#typeahead-options) goes over the available configs. 
-Subsequent arguments (`\*datasets`), are individual option hashes for datasets. 
+Subsequent arguments (`*datasets`), are individual option hashes for datasets. 
 For more details regarding datasets, refer to [Datasets](#datasets).
 
 ```javascript
@@ -194,7 +196,7 @@ When initializing a typeahead, there are a number of options you can configure.
 * `minLength` – The minimum character length needed before suggestions start 
   getting rendered. Defaults to `1`.
 
-### Dataset
+### Datasets
 
 A typeahead is composed of one or more datasets. For simple use cases, one 
 dataset will usually suffice. If however you wanted to build something like
@@ -207,14 +209,11 @@ Datasets can be configured using the following options.
   number.
 
 * `source` – The backing data source that provides suggestions. Expected to be 
-  either an [options hash for a bloodhound](#bloodhound-options), an instance
-  of a Bloodhoud, or a function with the signature `(query, cb)`. If the last
-  option is used, it is expected that the function will compute the suggestion 
-  set for `query`, convert the suggestions to an array of [datums](#datums), 
-  and then invoke `cb` with that array as the first and only argument.
-  
-  that `cb` will be invoked with an array of 
-  [datums](#datums) that are a match for `query`. **Required**.
+  either an [options hash for a bloodhound](#bloodhound-options), a Bloodhound
+  instance, or a function with the signature `(query, cb)`. If the last option 
+  is used, it is expected that the function will compute the suggestion set for
+  `query`, convert the suggestions to an array of [datums](#datums), and then 
+  invoke `cb` with that array as the first and only argument. **Required**.
 
 * `templates` – A hash of templates to be used when rendering the dataset.
 
@@ -335,10 +334,10 @@ bloodhound.initialize();
 
 #### Bloodhound#get(query, cb)
 
-Retrieves datums from the data source matching `query` and invokes `cb` with 
-them. `cb` will always be called at least once with the mixed results from
-`local` and `prefetch`. If those results are insufficent, `cb` will be called 
-again later with the mixed results from `local`, `prefetch`, **and** `remote`.
+Retrieves suggestions for `query` and invokes `cb` with them. `cb` will always 
+be called at least once with the mixed results from `local` and `prefetch`. If 
+those results are insufficent, `cb` will be called again later with the mixed 
+results from `local`, `prefetch`, **and** `remote`.
 
 ```javascript
 bloodhound.get(myQuery, function(suggestions) {
@@ -456,8 +455,8 @@ is token-based. When `Bloodhound#get` is called, it tokenizes `query` using
 tokens.
 
 By default, a bloodhound will generate tokens for a datum by tokenizing its 
-value. However, it is possible to explicitly set the tokens for a datum by 
-including a `tokens` property.
+value with `tokenizer`. However, it is possible to explicitly set the tokens 
+for a datum by including a `tokens` property.
 
 ```javascript
 {

From 8909c6115c88aa6fed4580a9b39f0488effa4ce9 Mon Sep 17 00:00:00 2001
From: Jake Harding <jharding@twitter.com>
Date: Sat, 1 Feb 2014 21:44:46 -0800
Subject: [PATCH 07/17] Make final API changes for v0.10.

---
 src/bloodhound/bloodhound.js     | 147 ++++---------------------------
 src/bloodhound/options_parser.js |  87 ++++++++++++++++++
 src/bloodhound/search_index.js   |  22 ++---
 src/typeahead/dataset.js         |   4 +-
 src/typeahead/plugin.js          |  54 +-----------
 5 files changed, 117 insertions(+), 197 deletions(-)
 create mode 100644 src/bloodhound/options_parser.js

diff --git a/src/bloodhound/bloodhound.js b/src/bloodhound/bloodhound.js
index bb25ab2d..2ce1f4df 100644
--- a/src/bloodhound/bloodhound.js
+++ b/src/bloodhound/bloodhound.js
@@ -18,19 +18,21 @@ var Bloodhound = window.Bloodhound = (function() {
     }
 
     this.limit = o.limit || 5;
-    this.valueKey = o.valueKey || 'value';
-    this.sorter = getSorter(o.sorter);
-    this.dupDetector = getDupDetector(o.dupDetector, this.valueKey);
+    this.sorter = o.sorter || noSort;
+    this.dupDetector = o.dupDetector || ignoreDuplicates;
 
-    this.local = getLocal(o);
-    this.prefetch = getPrefetch(o);
-    this.remote = getRemote(o);
+    this.local = oParser.local(o);
+    this.prefetch = oParser.prefetch(o);
+    this.remote = oParser.remote(o);
 
     this.cacheKey = this.prefetch ?
       (this.prefetch.cacheKey || this.prefetch.url) : null;
 
     // the backing data structure used for fast pattern matching
-    this.index = new SearchIndex({ tokenizer: o.tokenizer });
+    this.index = new SearchIndex({
+      datumTokenizer: o.datumTokenizer,
+      queryTokenizer: o.queryTokenizer
+    });
 
     // only initialize storage if there's a cacheKey otherwise
     // loading from storage on subsequent page loads is impossible
@@ -59,7 +61,7 @@ var Bloodhound = window.Bloodhound = (function() {
       return deferred;
 
       function handlePrefetchResponse(resp) {
-        var filtered, normalized;
+        var filtered;
 
         filtered = o.filter ? o.filter(resp) : resp;
         that.add(filtered);
@@ -72,7 +74,6 @@ var Bloodhound = window.Bloodhound = (function() {
       var that = this, url, uriEncodedQuery;
 
       query = query || '';
-
       uriEncodedQuery = encodeURIComponent(query);
 
       url = this.remote.replace ?
@@ -84,28 +85,7 @@ var Bloodhound = window.Bloodhound = (function() {
       function handleRemoteResponse(resp) {
         var filtered = that.remote.filter ? that.remote.filter(resp) : resp;
 
-        cb(that._normalize(filtered));
-      }
-    },
-
-    _normalize: function normalize(data) {
-      var that = this;
-
-      return _.map(data, normalizeRawDatum);
-
-      function normalizeRawDatum(raw) {
-        var value, datum;
-
-        value = _.isString(raw) ? raw : raw[that.valueKey];
-        datum = { value: value, tokens: raw.tokens };
-
-        // if the raw datum is a string, transform it into an
-        // object as that's what gets passed to the precompiled templates
-        _.isString(raw) ?
-          (datum.raw = {})[that.valueKey] = raw :
-          datum.raw = raw;
-
-        return datum;
+        cb(filtered);
       }
     },
 
@@ -156,18 +136,13 @@ var Bloodhound = window.Bloodhound = (function() {
     },
 
     add: function add(data) {
-      var normalized;
-
-      data = _.isArray(data) ? data : [data];
-      normalized = this._normalize(data);
-
-      this.index.add(normalized);
+      this.index.add(data);
     },
 
     get: function get(query, cb) {
       var that = this, matches, cacheHit = false;
 
-      matches = _.map(this.index.get(query), pickRaw)
+      matches = this.index.get(query)
       .sort(this.sorter)
       .slice(0, this.limit);
 
@@ -183,8 +158,6 @@ var Bloodhound = window.Bloodhound = (function() {
       function returnRemoteMatches(remoteMatches) {
         var matchesWithBackfill = matches.slice(0);
 
-        remoteMatches = _.map(remoteMatches, pickRaw);
-
         _.each(remoteMatches, function(remoteMatch) {
           var isDuplicate;
 
@@ -202,9 +175,9 @@ var Bloodhound = window.Bloodhound = (function() {
 
         cb && cb(matchesWithBackfill.sort(that.sorter));
       }
+    },
 
-      function pickRaw(obj) { return obj.raw; }
-    }
+    ttAdapter: function ttAdapter() { return _.bind(this.get, this); }
   });
 
   return Bloodhound;
@@ -212,93 +185,7 @@ var Bloodhound = window.Bloodhound = (function() {
   // helper functions
   // ----------------
 
-  function getSorter(sorter) {
-    return sorter || defaultSorter;
-
-    function defaultSorter() { return 0; }
-  }
-
-  function getDupDetector(dupDetector, valueKey) {
-    if (!_.isFunction(dupDetector)) {
-      dupDetector = dupDetector === false ? ignoreDups : defaultDupDetector;
-    }
-
-    return dupDetector;
-
-    function ignoreDups() { return false; }
-    function defaultDupDetector(a, b) { return a[valueKey] === b[valueKey]; }
-  }
-
-  function getLocal(o) {
-    return o.local || null;
-  }
+  function noSort() { return 0; }
 
-  function getPrefetch(o) {
-    var prefetch, defaults;
-
-    defaults = {
-      url: null,
-      thumbprint: '',
-      ttl: 24 * 60 * 60 * 1000, // 1 day
-      filter: null,
-      ajax: {}
-    };
-
-    if (prefetch = o.prefetch || null) {
-      // support basic (url) and advanced configuration
-      prefetch = _.isString(prefetch) ? { url: prefetch } : prefetch;
-
-      prefetch = _.mixin(defaults, prefetch);
-      prefetch.thumbprint = VERSION + prefetch.thumbprint;
-
-      prefetch.ajax.method = prefetch.ajax.method || 'get';
-      prefetch.ajax.dataType = prefetch.ajax.dataType || 'json';
-
-      !prefetch.url && $.error('prefetch requires url to be set');
-    }
-
-    return prefetch;
-  }
-
-  function getRemote(o) {
-    var remote, defaults;
-
-    defaults = {
-      url: null,
-      wildcard: '%QUERY',
-      replace: null,
-      rateLimitBy: 'debounce',
-      rateLimitWait: 300,
-      send: null,
-      filter: null,
-      ajax: {}
-    };
-
-    if (remote = o.remote || null) {
-      // support basic (url) and advanced configuration
-      remote = _.isString(remote) ? { url: remote } : remote;
-
-      remote = _.mixin(defaults, remote);
-      remote.rateLimiter = /^throttle$/i.test(remote.rateLimitBy) ?
-        byThrottle(remote.rateLimitWait) : byDebounce(remote.rateLimitWait);
-
-      remote.ajax.method = remote.ajax.method || 'get';
-      remote.ajax.dataType = remote.ajax.dataType || 'json';
-
-      delete remote.rateLimitBy;
-      delete remote.rateLimitWait;
-
-      !remote.url && $.error('remote requires url to be set');
-    }
-
-    return remote;
-
-    function byDebounce(wait) {
-      return function(fn) { return _.debounce(fn, wait); };
-    }
-
-    function byThrottle(wait) {
-      return function(fn) { return _.throttle(fn, wait); };
-    }
-  }
+  function ignoreDuplicates() { return false; }
 })();
diff --git a/src/bloodhound/options_parser.js b/src/bloodhound/options_parser.js
new file mode 100644
index 00000000..42c5d813
--- /dev/null
+++ b/src/bloodhound/options_parser.js
@@ -0,0 +1,87 @@
+/*
+ * typeahead.js
+ * https://github.com/twitter/typeahead.js
+ * Copyright 2013 Twitter, Inc. and other contributors; Licensed MIT
+ */
+
+var oParser = (function() {
+
+  return {
+    local: getLocal,
+    prefetch: getPrefetch,
+    remote: getRemote
+  };
+
+  function getLocal(o) {
+    return o.local || null;
+  }
+
+  function getPrefetch(o) {
+    var prefetch, defaults;
+
+    defaults = {
+      url: null,
+      thumbprint: '',
+      ttl: 24 * 60 * 60 * 1000, // 1 day
+      filter: null,
+      ajax: {}
+    };
+
+    if (prefetch = o.prefetch || null) {
+      // support basic (url) and advanced configuration
+      prefetch = _.isString(prefetch) ? { url: prefetch } : prefetch;
+
+      prefetch = _.mixin(defaults, prefetch);
+      prefetch.thumbprint = VERSION + prefetch.thumbprint;
+
+      prefetch.ajax.method = prefetch.ajax.method || 'get';
+      prefetch.ajax.dataType = prefetch.ajax.dataType || 'json';
+
+      !prefetch.url && $.error('prefetch requires url to be set');
+    }
+
+    return prefetch;
+  }
+
+  function getRemote(o) {
+    var remote, defaults;
+
+    defaults = {
+      url: null,
+      wildcard: '%QUERY',
+      replace: null,
+      rateLimitBy: 'debounce',
+      rateLimitWait: 300,
+      send: null,
+      filter: null,
+      ajax: {}
+    };
+
+    if (remote = o.remote || null) {
+      // support basic (url) and advanced configuration
+      remote = _.isString(remote) ? { url: remote } : remote;
+
+      remote = _.mixin(defaults, remote);
+      remote.rateLimiter = /^throttle$/i.test(remote.rateLimitBy) ?
+        byThrottle(remote.rateLimitWait) : byDebounce(remote.rateLimitWait);
+
+      remote.ajax.method = remote.ajax.method || 'get';
+      remote.ajax.dataType = remote.ajax.dataType || 'json';
+
+      delete remote.rateLimitBy;
+      delete remote.rateLimitWait;
+
+      !remote.url && $.error('remote requires url to be set');
+    }
+
+    return remote;
+
+    function byDebounce(wait) {
+      return function(fn) { return _.debounce(fn, wait); };
+    }
+
+    function byThrottle(wait) {
+      return function(fn) { return _.throttle(fn, wait); };
+    }
+  }
+})();
diff --git a/src/bloodhound/search_index.js b/src/bloodhound/search_index.js
index c62619be..85f27522 100644
--- a/src/bloodhound/search_index.js
+++ b/src/bloodhound/search_index.js
@@ -12,7 +12,12 @@ var SearchIndex = (function() {
   function SearchIndex(o) {
     o = o || {};
 
-    this.tokenize = o.tokenizer || tokenize;
+    if (!o.datumTokenizer || !o.queryTokenizer) {
+      $.error('datumTokenizer and queryTokenizer are both required');
+    }
+
+    this.datumTokenizer = o.datumTokenizer;
+    this.queryTokenizer = o.queryTokenizer;
 
     this.datums = [];
     this.trie = newNode();
@@ -39,10 +44,7 @@ var SearchIndex = (function() {
         var id, tokens;
 
         id = that.datums.push(datum) - 1;
-        tokens = normalizeTokens(datum.tokens || that.tokenize(datum.value));
-
-        // delete the tokens from the datum object to save storage space
-        delete datum.tokens;
+        tokens = normalizeTokens(that.datumTokenizer(datum));
 
         _.each(tokens, function(token) {
           var node, chars, ch, ids;
@@ -58,14 +60,10 @@ var SearchIndex = (function() {
       });
     },
 
-    remove: function remove() {
-      $.error('not implemented');
-    },
-
     get: function get(query) {
       var that = this, tokens, matches;
 
-      tokens = this.tokenize(query);
+      tokens = normalizeTokens(this.queryTokenizer(query));
 
       _.each(tokens, function(token) {
         var node, chars, ch, ids;
@@ -107,10 +105,6 @@ var SearchIndex = (function() {
   // helper functions
   // ----------------
 
-  function tokenize(str) {
-    return $.trim(str).toLowerCase().split(/\s+/);
-  }
-
   function normalizeTokens(tokens) {
    // filter out falsy tokens
     tokens = _.filter(tokens, function(token) { return !!token; });
diff --git a/src/typeahead/dataset.js b/src/typeahead/dataset.js
index 46082e35..3a034e91 100644
--- a/src/typeahead/dataset.js
+++ b/src/typeahead/dataset.js
@@ -25,7 +25,7 @@ var Dataset = (function() {
     this.name = o.name || _.getUniqueId();
 
     this.source = o.source;
-    this.valueKey = o.valueKey || 'value';
+    this.valueKey = o.displayKey || 'value';
 
     this.templates = getTemplates(o.templates, this.valueKey);
 
@@ -160,8 +160,6 @@ var Dataset = (function() {
   // ----------------
 
   function getTemplates(templates, valueKey) {
-    valueKey = valueKey || 'value';
-
     return {
       empty: templates.empty && _.templatify(templates.empty),
       header: templates.header && _.templatify(templates.header),
diff --git a/src/typeahead/plugin.js b/src/typeahead/plugin.js
index 10f73d52..6e34da78 100644
--- a/src/typeahead/plugin.js
+++ b/src/typeahead/plugin.js
@@ -4,7 +4,7 @@
  * Copyright 2013 Twitter, Inc. and other contributors; Licensed MIT
  */
 
-(function(Bloodhound) {
+(function() {
   var typeaheadKey, methods;
 
   typeaheadKey = 'ttTypeahead';
@@ -18,21 +18,11 @@
       return this.each(attach);
 
       function attach() {
-        var $input = $(this), promises, eventBus, typeahead;
-
-        promises = _.map(datasets, function(d) {
-          var promise = $.Deferred().resolve();
+        var $input = $(this), eventBus, typeahead;
 
+        _.each(datasets, function(d) {
           // HACK: force highlight as a top-level config
           d.highlight = !!o.highlight;
-
-          // if source is an object, convert it to a bloodhound
-          if (_.isObject(d.source) || isBloodhound(d.source)) {
-            d.source = bloodhoundAdapter(d.source);
-            promise = d.source.initialize();
-          }
-
-          return promise;
         });
 
         typeahead = new Typeahead({
@@ -46,14 +36,6 @@
 
         $input.data(typeaheadKey, typeahead);
 
-        // only trigger these events if at least one dataset is
-        // using a bloodhound as a source
-        if (promises.length) {
-          $.when.apply($, promises)
-          .done(trigger('initialized'))
-          .fail(trigger('initialized:err'));
-        }
-
         // defer trigging of events to make it possible to attach
         // a listener immediately after jQuery#typeahead is invoked
         function trigger(eventName) {
@@ -134,32 +116,4 @@
       return methods.initialize.apply(this, arguments);
     }
   };
-
-  // helper functions
-  // ----------------
-
-  function bloodhoundAdapter(o) {
-    var bloodhound, source;
-
-    if (!Bloodhound) {
-      $.error('Bloodhound constructor has not been loaded');
-    }
-
-    bloodhound = isBloodhound(o) ? o : new Bloodhound(o);
-    source = _.bind(bloodhound.get, bloodhound);
-
-    source.initialize = function() {
-      return bloodhound.initialize();
-    };
-
-    source.add = function(data) {
-      bloodhound.add();
-    };
-
-    return source;
-  };
-
-  function isBloodhound(obj) {
-    return Bloodhound && obj instanceof Bloodhound;
-  }
-})(window.Bloodhound);
+})();

From 2e7d917fe2068316d607b297cc7454a74ddc67eb Mon Sep 17 00:00:00 2001
From: Jake Harding <jharding@twitter.com>
Date: Sat, 1 Feb 2014 21:45:20 -0800
Subject: [PATCH 08/17] Update tests for latest API.

---
 Gruntfile.js                    |   1 +
 karma.conf.js                   |   1 +
 test/bloodhound_spec.js         |  55 +++++++-
 test/fixtures/ajax_responses.js |   2 +-
 test/fixtures/data.js           |  57 ++------
 test/playground.html            | 228 ++++++++++++++++++--------------
 test/search_index_spec.js       |  27 ++--
 test/typeahead_view_spec.js     |   2 +-
 8 files changed, 210 insertions(+), 163 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 328dc9fc..b84e3f78 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -10,6 +10,7 @@ var semver = require('semver'),
       'src/bloodhound/persistent_storage.js',
       'src/bloodhound/transport.js',
       'src/bloodhound/search_index.js',
+      'src/bloodhound/options_parser.js',
       'src/bloodhound/bloodhound.js'
       ],
       typeahead: [
diff --git a/karma.conf.js b/karma.conf.js
index 8a7719fe..1571ceba 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -15,6 +15,7 @@ files = [
   'src/bloodhound/persistent_storage.js',
   'src/bloodhound/transport.js',
   'src/bloodhound/search_index.js',
+  'src/bloodhound/options_parser.js',
   'src/bloodhound/bloodhound.js',
   'src/typeahead/html.js',
   'src/typeahead/css.js',
diff --git a/test/bloodhound_spec.js b/test/bloodhound_spec.js
index 96c00c65..1edbe595 100644
--- a/test/bloodhound_spec.js
+++ b/test/bloodhound_spec.js
@@ -12,7 +12,12 @@ describe('Bloodhound', function() {
 
   describe('local', function() {
     beforeEach(function() {
-      this.bloodhound = new Bloodhound({ local: fixtures.data.simple });
+      this.bloodhound = new Bloodhound({
+        datumTokenizer: datumTokenizer,
+        queryTokenizer: queryTokenizer,
+        local: fixtures.data.simple
+      });
+
       this.bloodhound.initialize();
     });
 
@@ -40,11 +45,15 @@ describe('Bloodhound', function() {
       var ttl = 100;
 
       this.bloodhound1 = new Bloodhound({
+        datumTokenizer: datumTokenizer,
+        queryTokenizer: queryTokenizer,
         prefetch: { url: '/test1', cacheKey: 'woah' }
       });
       expect(PersistentStorage).toHaveBeenCalledWith('woah');
 
       this.bloodhound2 = new Bloodhound({
+        datumTokenizer: datumTokenizer,
+        queryTokenizer: queryTokenizer,
         prefetch: { url: '/test2', ttl: ttl, thumbprint: '!' }
       });
       expect(PersistentStorage).toHaveBeenCalledWith('/test2');
@@ -66,8 +75,16 @@ describe('Bloodhound', function() {
       spy1 = jasmine.createSpy();
       spy2 = jasmine.createSpy();
 
-      this.bloodhound1 = new Bloodhound({ prefetch: '/test1' });
-      this.bloodhound2 = new Bloodhound({ prefetch: { url: '/test2' } });
+      this.bloodhound1 = new Bloodhound({
+        datumTokenizer: datumTokenizer,
+        queryTokenizer: queryTokenizer,
+        prefetch: '/test1'
+      });
+      this.bloodhound2 = new Bloodhound({
+        datumTokenizer: datumTokenizer,
+        queryTokenizer: queryTokenizer,
+        prefetch: { url: '/test2' }
+      });
       this.bloodhound1.initialize();
       this.bloodhound2.initialize();
 
@@ -100,6 +117,8 @@ describe('Bloodhound', function() {
       spy = jasmine.createSpy();
 
       this.bloodhound = new Bloodhound({
+        datumTokenizer: datumTokenizer,
+        queryTokenizer: queryTokenizer,
         prefetch: { url: '/test', filter: filterSpy }
       });
       this.bloodhound.initialize();
@@ -117,14 +136,18 @@ describe('Bloodhound', function() {
       ]);
 
       function fakeFilter(resp) {
-        return ['BIG', 'BIGGER', 'BIGGEST'];
+        return [{ value: 'BIG' }, { value: 'BIGGER' }, { value: 'BIGGEST' }];
       }
     });
 
     it('should not make a request if data is available in storage', function() {
       var that = this, spy = jasmine.createSpy();
 
-      this.bloodhound = new Bloodhound({ name: 'name', prefetch: '/test' });
+      this.bloodhound = new Bloodhound({
+        datumTokenizer: datumTokenizer,
+        queryTokenizer: queryTokenizer,
+        prefetch: '/test'
+      });
       this.bloodhound.storage.get.andCallFake(fakeGet);
       this.bloodhound.initialize();
 
@@ -161,9 +184,13 @@ describe('Bloodhound', function() {
   describe('remote', function() {
     it('should perform query substitution on the provided url', function() {
       this.bloodhound1 = new Bloodhound({
+        datumTokenizer: datumTokenizer,
+        queryTokenizer: queryTokenizer,
         remote: { url: '/test?q=$$', wildcard: '$$' }
       });
       this.bloodhound2 = new Bloodhound({
+        datumTokenizer: datumTokenizer,
+        queryTokenizer: queryTokenizer,
         remote: {
           url: '/test?q=%QUERY',
           replace: function(str, query) {return str.replace('%QUERY', query);  }
@@ -196,6 +223,8 @@ describe('Bloodhound', function() {
       filterSpy = jasmine.createSpy().andCallFake(fakeFilter);
 
       this.bloodhound = new Bloodhound({
+        datumTokenizer: datumTokenizer,
+        queryTokenizer: queryTokenizer,
         remote: { url: '/test', filter: filterSpy }
       });
       this.bloodhound.initialize();
@@ -216,7 +245,7 @@ describe('Bloodhound', function() {
       });
 
       function fakeFilter(resp) {
-        return ['BIG', 'BIGGER', 'BIGGEST'];
+        return [{ value: 'BIG' }, { value: 'BIGGER' }, { value: 'BIGGEST' }];
       }
 
       function fakeGet(url, o, cb) {
@@ -227,7 +256,11 @@ describe('Bloodhound', function() {
     it('should call #get callback once if cache hit', function() {
       var spy = jasmine.createSpy();
 
-      this.bloodhound = new Bloodhound({ remote: '/test?q=%QUERY' });
+      this.bloodhound = new Bloodhound({
+        datumTokenizer: datumTokenizer,
+        queryTokenizer: queryTokenizer,
+        remote: '/test?q=%QUERY'
+      });
       this.bloodhound.initialize();
       this.bloodhound.transport.get.andCallFake(fakeGet);
 
@@ -251,6 +284,8 @@ describe('Bloodhound', function() {
 
       this.bloodhound = new Bloodhound({
         limit: 3,
+        datumTokenizer: datumTokenizer,
+        queryTokenizer: queryTokenizer,
         local: fixtures.data.simple,
         remote: { url: '/test?q=%QUERY' }
       });
@@ -291,4 +326,10 @@ describe('Bloodhound', function() {
       }
     });
   });
+
+  // helper functions
+  // ----------------
+
+  function datumTokenizer(d) { return $.trim(d.value).split(/\s+/); }
+  function queryTokenizer(s) { return $.trim(s).split(/\s+/); }
 });
diff --git a/test/fixtures/ajax_responses.js b/test/fixtures/ajax_responses.js
index c6e4f342..c24a6982 100644
--- a/test/fixtures/ajax_responses.js
+++ b/test/fixtures/ajax_responses.js
@@ -3,7 +3,7 @@ var fixtures = fixtures || {};
 fixtures.ajaxResps = {
   ok: {
     status: 200,
-    responseText: '["big", "bigger", "biggest", "small", "smaller", "smallest"]'
+    responseText: '[{ "value": "big" }, { "value": "bigger" }, { "value": "biggest" }, { "value": "small" }, { "value": "smaller" }, { "value": "smallest" }]'
   },
   ok1: {
     status: 200,
diff --git a/test/fixtures/data.js b/test/fixtures/data.js
index ea310c3e..2f7fb9ad 100644
--- a/test/fixtures/data.js
+++ b/test/fixtures/data.js
@@ -9,58 +9,23 @@ fixtures.data = {
     { value: 'smaller' },
     { value: 'smallest' }
   ],
-  animals: ['dog', 'cat', 'moose']
-};
-
-fixtures.normalized = {
-  simple: [
-    { value: 'big', raw: { value: 'big' } },
-    { value: 'bigger', raw: { value: 'bigger' } },
-    { value: 'biggest', raw: { value: 'biggest' } },
-    { value: 'small', raw: { value: 'small' } },
-    { value: 'smaller', raw: { value: 'smaller' } },
-    { value: 'smallest', raw: { value: 'smallest' } }
-  ],
   animals: [
-    { value: 'dog', raw: { value: 'dog' } },
-    { value: 'cat', raw: { value: 'cat' } },
-    { value: 'moose', raw: { value: 'moose' } }
+    { value: 'dog' },
+    { value: 'cat' },
+    { value: 'moose' }
   ]
 };
 
 fixtures.serialized = {
   simple: {
-    "datums": [{
-      "value": "big",
-      "raw": {
-        "value": "big"
-      }
-    }, {
-      "value": "bigger",
-      "raw": {
-        "value": "bigger"
-      }
-    }, {
-      "value": "biggest",
-      "raw": {
-        "value": "biggest"
-      }
-    }, {
-      "value": "small",
-      "raw": {
-        "value": "small"
-      }
-    }, {
-      "value": "smaller",
-      "raw": {
-        "value": "smaller"
-      }
-    }, {
-      "value": "smallest",
-      "raw": {
-        "value": "smallest"
-      }
-    }],
+    "datums": [
+      { "value": "big" },
+      { "value": "bigger" },
+      { "value": "biggest" },
+      { "value": "small" },
+      { "value": "smaller" },
+      { "value": "smallest" }
+    ],
     "trie": {
       "ids": [],
       "children": {
diff --git a/test/playground.html b/test/playground.html
index 98589891..682a6824 100644
--- a/test/playground.html
+++ b/test/playground.html
@@ -50,122 +50,158 @@
     </div>
 
     <script>
+      var states = new Bloodhound({
+        datumTokenizer: function(d) { return d.val.split(/\s+/); },
+        queryTokenizer: function(q) { return q.split(/\s+/); },
+        local: [
+          { val: 'Alabama' },
+          { val: 'Alaska' },
+          { val: 'Arizona' },
+          { val: 'Arkansas' },
+          { val: 'California' },
+          { val: 'Colorado' },
+          { val: 'Connecticut' },
+          { val: 'Delaware' },
+          { val: 'Florida' },
+          { val: 'Georgia' },
+          { val: 'Hawaii' },
+          { val: 'Idaho' },
+          { val: 'Illinois' },
+          { val: 'Indiana' },
+          { val: 'Iowa' },
+          { val: 'Kansas' },
+          { val: 'Kentucky' },
+          { val: 'Louisiana' },
+          { val: 'Maine' },
+          { val: 'Maryland' },
+          { val: 'Massachusetts' },
+          { val: 'Michigan' },
+          { val: 'Minnesota' },
+          { val: 'Mississippi' },
+          { val: 'Missouri' },
+          { val: 'Montana' },
+          { val: 'Nebraska' },
+          { val: 'Nevada' },
+          { val: 'New Hampshire' },
+          { val: 'New Jersey' },
+          { val: 'New Mexico' },
+          { val: 'New York' },
+          { val: 'North Carolina' },
+          { val: 'North Dakota' },
+          { val: 'Ohio' },
+          { val: 'Oklahoma' },
+          { val: 'Oregon' },
+          { val: 'Pennsylvania' },
+          { val: 'Rhode Island' },
+          { val: 'South Carolina' },
+          { val: 'South Dakota' },
+          { val: 'Tennessee' },
+          { val: 'Texas' },
+          { val: 'Utah' },
+          { val: 'Vermont' },
+          { val: 'Virginia' },
+          { val: 'Washington' },
+          { val: 'West Virginia' },
+          { val: 'Wisconsin' },
+          { val: 'Wyoming' }
+        ]
+      });
+
+      states.initialize();
+
       $('.states').typeahead({
         highlight: true
       },
       {
-        valueKey: 'state',
-        source: {
-          valueKey: 'state',
-          local: [
-            "Alabama",
-            "Alaska",
-            "Arizona",
-            "Arkansas",
-            "California",
-            "Colorado",
-            "Connecticut",
-            "Delaware",
-            "Florida",
-            "Georgia",
-            "Hawaii",
-            "Idaho",
-            "Illinois",
-            "Indiana",
-            "Iowa",
-            "Kansas",
-            "Kentucky",
-            "Louisiana",
-            "Maine",
-            "Maryland",
-            "Massachusetts",
-            "Michigan",
-            "Minnesota",
-            "Mississippi",
-            "Missouri",
-            "Montana",
-            "Nebraska",
-            "Nevada",
-            "New Hampshire",
-            "New Jersey",
-            "New Mexico",
-            "New York",
-            "North Carolina",
-            "North Dakota",
-            "Ohio",
-            "Oklahoma",
-            "Oregon",
-            "Pennsylvania",
-            "Rhode Island",
-            "South Carolina",
-            "South Dakota",
-            "Tennessee",
-            "Texas",
-            "Utah",
-            "Vermont",
-            "Virginia",
-            "Washington",
-            "West Virginia",
-            "Wisconsin",
-            "Wyoming"
-          ]
-        }
+        displayKey: 'val',
+        source: states.ttAdapter()
       });
 
 
+      var badTokens = new Bloodhound({
+        datumTokenizer: function(d) { return d.tokens; },
+        queryTokenizer: function(q) { return q.split(/\s+/); },
+        local: [
+          {
+            value1: 'all bad',
+            jake: '111',
+            tokens: ['  ', ' ', null, undefined, false, 'all', 'bad']
+          },
+          {
+            value1: 'whitespace',
+            jake: '112',
+            tokens: ['  ', ' ', '\t', '\n', 'whitespace']
+          },
+          {
+            value1: 'undefined',
+            jake: '113',
+            tokens: [undefined, 'undefined']
+          },
+          {
+            value1: 'null',
+            jake: '114',
+            tokens: [null, 'null']
+          },
+          {
+            value1: 'false',
+            jake: '115',
+            tokens: [false, 'false']
+          }
+        ]
+      });
+
+      badTokens.initialize();
+
       $('.bad-tokens').typeahead(null, {
-        source: {
-          local: [
-            {
-              value: 'all bad',
-              tokens: ['  ', ' ', null, undefined, false, 'all', 'bad']
-            },
-            {
-              value: 'whitespace',
-              tokens: ['  ', ' ', '\t', '\n', 'whitespace']
-            },
-            {
-              value: 'undefined',
-              tokens: [undefined, 'undefined']
-            },
-            {
-              value: 'null',
-              tokens: [null, 'null']
-            },
-            {
-              value: 'false',
-              tokens: [false, 'false']
-            }
-          ]
-        }
+        displayKey: 'value1',
+        source: badTokens.ttAdapter()
       });
 
+      var regexSymbols = new Bloodhound({
+        datumTokenizer: function(d) { return d.val.split(/\s+/); },
+        queryTokenizer: function(q) { return q.split(/\s+/); },
+        local: [
+          { val: '*.js' },
+          { val: '[Tt]ypeahead.js' },
+          { val: '^typeahead.js$' },
+          { val: 'typeahead.js(0.8.2)' },
+          { val: 'typeahead.js(@\\d.\\d.\\d)' },
+          { val: 'typeahead.js@0.8.2' }
+        ]
+      });
+
+      regexSymbols.initialize();
+
       $('.regex-symbols').typeahead(null, {
-        source: {
-          local: [
-            '*.js',
-            '[Tt]ypeahead.js',
-            '^typeahead.js$',
-            'typeahead.js(0.8.2)',
-            'typeahead.js(@\\d.\\d.\\d)',
-            'typeahead.js@0.8.2'
-          ]
-        }
+        displayKey: 'val',
+        source: regexSymbols.ttAdapter()
       });
 
+      var abc = new Bloodhound({
+        datumTokenizer: function(d) { return d.val.split(/\s+/); },
+        queryTokenizer: function(q) { return q.split(/\s+/); },
+        local: [
+          { val: 'a' }, 
+          { val: 'ab' }, 
+          { val: 'abc' }, 
+          { val: 'abcd' }, 
+          { val: 'abcde' }
+        ]
+      });
+
+      abc.initialize();
+
       $('.header-footer').typeahead(null, {
-        source: {
-          local: ['a', 'ab', 'abc', 'abcd', 'abcde']
-        },
+        displayKey: 'val',
+        source: abc.ttAdapter(),
         templates: {
           header: '<h3>Header</h3>',
           footer: '<h3>Footer</h3>'
         }
       },
       {
-        source: {
-          local: ['a', 'ab', 'abc', 'abcd', 'abcde']
-        },
+        displayKey: 'val',
+        source: abc.ttAdapter(),
         templates: {
           header: '<h3>start</h3>',
           footer: '<h3>end</h3>',
diff --git a/test/search_index_spec.js b/test/search_index_spec.js
index e649558a..65655f90 100644
--- a/test/search_index_spec.js
+++ b/test/search_index_spec.js
@@ -1,14 +1,21 @@
 describe('SearchIndex', function() {
 
   beforeEach(function() {
-    this.searchIndex = new SearchIndex();
+    this.searchIndex = new SearchIndex({
+      datumTokenizer: datumTokenizer,
+      queryTokenizer: queryTokenizer
+    });
+
     this.searchIndex.add(fixtures.data.simple);
   });
 
   it('should support serialization/deserialization', function() {
     var serialized = this.searchIndex.serialize();
 
-    this.searchIndex = new SearchIndex();
+    this.searchIndex = new SearchIndex({
+      datumTokenizer: datumTokenizer,
+      queryTokenizer: queryTokenizer
+    });
     this.searchIndex.bootstrap(serialized);
 
     expect(this.searchIndex.get('smaller')).toEqual([{ value: 'smaller' }]);
@@ -20,12 +27,6 @@ describe('SearchIndex', function() {
     expect(this.searchIndex.get('new')).toEqual([{ value: 'new' }]);
   });
 
-  it('should allow tokens to be set manually', function() {
-    this.searchIndex.add({ value: 'old', tokens: ['new'] });
-
-    expect(this.searchIndex.get('new')).toEqual([{ value: 'old' }]);
-  });
-
   it('#get should return datums that match the given query', function() {
     expect(this.searchIndex.get('big')).toEqual([
       { value: 'big' },
@@ -40,11 +41,13 @@ describe('SearchIndex', function() {
     ]);
   });
 
-  it('#remote should throw an exception', function() {
-    expect(this.searchIndex.remove).toThrow();
-  });
-
   it('#get should return an empty array of there are no matches', function() {
     expect(this.searchIndex.get('wtf')).toEqual([]);
   });
+
+  // helper functions
+  // ----------------
+
+  function datumTokenizer(d) { return $.trim(d.value).split(/\s+/); }
+  function queryTokenizer(s) { return $.trim(s).split(/\s+/); }
 });
diff --git a/test/typeahead_view_spec.js b/test/typeahead_view_spec.js
index 8a1da234..e3aa3c7a 100644
--- a/test/typeahead_view_spec.js
+++ b/test/typeahead_view_spec.js
@@ -13,7 +13,7 @@ describe('Typeahead', function() {
     $fixture = $('#jasmine-fixtures');
     this.$input = $fixture.find('input');
 
-    testDatum = fixtures.normalized.simple[0];
+    testDatum = fixtures.data.simple[0];
 
     this.view = new Typeahead({
       input: this.$input,

From dcc4f9651fec7e776ae68f727fca781e28c0bcb7 Mon Sep 17 00:00:00 2001
From: Jake Harding <jharding@twitter.com>
Date: Sat, 1 Feb 2014 21:45:51 -0800
Subject: [PATCH 09/17] Break docs into 2 separate files.

---
 README.md               | 461 +---------------------------------------
 doc/bloodhound.md       | 204 ++++++++++++++++++
 doc/jquery_typeahead.md | 239 +++++++++++++++++++++
 3 files changed, 454 insertions(+), 450 deletions(-)
 create mode 100644 doc/bloodhound.md
 create mode 100644 doc/jquery_typeahead.md

diff --git a/README.md b/README.md
index 8e407916..e20026ba 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ a flexible JavaScript library that provides a strong foundation for building
 robust typeaheads.
 
 The typeahead.js library consists of 2 components: the suggestion engine, 
-[Bloodhound](#bloodhound), and the UI view, [Typeahead](#typeahead). 
+[Bloodhound], and the UI view, [Typeahead]. 
 The suggestion engine is responsible for computing suggestions for a given 
 query. The UI view is responsible for rendering suggestions and handling DOM 
 interactions. Both components can be used separately, but when used together, 
@@ -20,6 +20,8 @@ they can provided a rich typeahead experience.
 
 [gh-page]: http://twitter.github.io/typeahead.js/
 [twitter.com]: https://twitter.com
+[Bloodhound]: https://github.com/twitter/typeahead.js/blob/master/doc/bloodhound.md
+[Typeahead]: https://github.com/twitter/typeahead.js/blob/master/doc/jquery_typeahead.md
 
 Getting Started
 ---------------
@@ -50,52 +52,14 @@ Other methods:
 [typeahead.bundle.min.js]: http://twitter.github.com/typeahead.js/releases/latest/typeahead.bundle.min.js
 [jQuery]: http://jquery.com/
 
-Table of Contents
------------------
-
-* [Features](#features)
-* [Examples](#examples)
-* [Typeahead](#typeahead)
-  * [API](#typeahead-api)
-  * [Options](#typeahead-options)
-  * [Datasets](#datasets)
-  * [Custom Events](#custom-events)
-  * [Look and Feel](#look-and-feel)
-* [Bloodhound](#bloodhound)
-  * [API](#bloodhound-api)
-  * [Options](#bloodhound-options)
-  * [Prefetch](#prefetch)
-  * [Remote](#remote)
-  * [Tokens](#tokens)
-* [Datum](#datum)
-* [Browser Support](#broswer-support)
-* [Customer Support](#customer-support)
-* [Issues](#issues)
-* [Versioning](#versioning)
-* [Testing](#testing)
-* [Developers](#developers)
-* [Authors](#authors)
-* [License](#license)
-
-Features
---------
-
-**Typeahead**
+Documentation 
+-------------
 
-* Displays suggestions to end-users as they type
-* Shows top suggestion as a hint (i.e. background text)
-* Supports custom templates to allow for UI flexibility
-* Works well with RTL languages and input method editors
-* Highlights query matches within the suggestion
-* Triggers custom events
+* [Typeahead Docs]
+* [Bloodhound Docs]
 
-**Bloodhound**
-
-* Works with hardcoded data
-* Prefetches data on initialization to reduce suggestion latency
-* Uses local storage intelligently to cut down on network requests
-* Backfills suggestions from a remote source
-* Rate-limits and caches network requests to remote sources to lighten the load
+[Typeahead Docs]: https://github.com/twitter/typeahead.js/blob/master/doc/jquery_typeahead.md
+[Bloodhound Docs]: https://github.com/twitter/typeahead.js/blob/master/doc/bloodhound.md
 
 Examples
 --------
@@ -106,411 +70,6 @@ For some working examples of typeahead.js, visit the [examples page].
 
 [examples page]: http://twitter.github.io/typeahead.js/examples
 
-Typeahead
----------
-
-The typeahead component is a jQuery plugin for adding typeahead functionality
-to `input` elements. It deals with rendering suggestions and handling DOM
-interactions. 
-
-### Typeahead API
-
-#### jQuery#typeahead(options, [\*datasets])
-
-Turns any `input[type="text"]` element into a typeahead. `options` is an 
-options hash that's used to configure the typeahead to your liking.
-[Typeahead Options](#typeahead-options) goes over the available configs. 
-Subsequent arguments (`*datasets`), are individual option hashes for datasets. 
-For more details regarding datasets, refer to [Datasets](#datasets).
-
-```javascript
-$('.typeahead').typeahead({
-  minLength: 3,
-  hightlight: true,
-},
-{
-  name: 'hanson-brothers',
-  source: {
-    local: ['Jeff', 'Steve', 'Jack']
-  }
-});
-```
-
-#### jQuery#typeahead('destroy')
-
-Removes typeahead functionality and reverts the `input` element back to its 
-original state.
-
-```javascript
-$('.typeahead').typeahead('destroy');
-```
-
-#### jQuery#typeahead('open')
-
-Opens the dropdown menu of typeahead. Note that being open does not mean that
-the menu is visible. The menu is only visible when it is open and has content.
-
-```javascript
-$('.typeahead').typeahead('open');
-```
-
-#### jQuery#typeahead('close')
-
-Closes the dropdown menu of typeahead.
-
-```javascript
-$('.typeahead').typeahead('close');
-```
-
-#### jQuery#typeahead('val')
-
-Returns the current value of the typeahead. The value is the text the user has 
-entered into the `input` element.
-
-```javascript
-var myVal = $('.typeahead').typeahead('val');
-```
-
-#### jQuery#typeahead('val', val)
-
-Sets the value of the typeahead. This should be used in place of `jQuery#val`.
-
-```javascript
-$('.typeahead').typeahead('val', myVal);
-```
-
-### Typeahead Options
-
-When initializing a typeahead, there are a number of options you can configure.
-
-* `autoselect` – If `true`, defaults the suggestion selection to the top 
-  suggestion when the user keys enter while the dropdown menu is open. Defaults
-  to `false`.
-
-* `highlight` – If `true`, when suggestions are rendered, pattern matches
-  for the current query in text nodes will be wrapped in a `strong` element. 
-  Defaults to `false`.
-
-* `hint` – If `false`, the typeahead will not show a hint. Defaults to `true`.
-
-* `minLength` – The minimum character length needed before suggestions start 
-  getting rendered. Defaults to `1`.
-
-### Datasets
-
-A typeahead is composed of one or more datasets. For simple use cases, one 
-dataset will usually suffice. If however you wanted to build something like
-the search typeahead on twitter.com, you'd need multiple datasets.
-
-Datasets can be configured using the following options.
-
-* `name` – The name of the dataset. This will be prepended to `tt-dataset-` to 
-  form the class name of the containing DOM element. Defaults to a random 
-  number.
-
-* `source` – The backing data source that provides suggestions. Expected to be 
-  either an [options hash for a bloodhound](#bloodhound-options), a Bloodhound
-  instance, or a function with the signature `(query, cb)`. If the last option 
-  is used, it is expected that the function will compute the suggestion set for
-  `query`, convert the suggestions to an array of [datums](#datums), and then 
-  invoke `cb` with that array as the first and only argument. **Required**.
-
-* `templates` – A hash of templates to be used when rendering the dataset.
-
-  * `empty` – Rendered when `0` suggestions are available for the given query. 
-  Can be either a HTML string or a precompiled template. If it's a precompiled
-  template, the passed in context will contain `query`.
-
-  * `footer`– Rendered at the bottom of the dataset. Can be either a HTML 
-  string or a precompiled template. If it's a precompiled template, the passed 
-  in context will contain `query` and `isEmpty`.
-
-  * `header` – Rendered at the top of the dataset. Can be either a HTML string 
-  or a precompiled template. If it's a precompiled template, the passed in 
-  context will contain `query` and `isEmpty`.
-
-  * `suggestion` – Used to render a single suggestion. If set, this has to be a 
-  precompiled template. The associated datum object will serves as the context. 
-  Defaults to the value of the datum wrapped in a `p` tag i.e. 
-  `<p>{{query}}</p>`.
-
-### Custom Events
-
-The typeahead component triggers the following custom events.
-
-* `typeahead:initialized` – Triggered after the source of each dataset has
-  been initialized. Note, for non-bloodhound sources, initialization cannot
-  be detected so those sources are ignored i.e. if you use all non-bloodhound
-  sources, this event will be triggered right away.
-
-* `typeahead:opened` – Triggered when the dropdown menu of a typeahead is 
-  opened.
-
-* `typeahead:closed` – Triggered when the dropdown menu of a typeahead is 
-  closed.
-
-* `typeahead:cursorchanged` – Triggered when the dropdown menu cursor is moved
-  to a different suggestion. The datum for the suggestion that the cursor was
-  moved to is passed to the event handler as an argument in addition to the name 
-  of the dataset it belongs to.
-
-* `typeahead:selected` – Triggered when a suggestion from the dropdown menu is 
-  selected. The datum for the selected suggestion is passed to the event handler 
-  as an argument in addition to the name of the dataset it belongs to.
-
-* `typeahead:autocompleted` – Triggered when the query is autocompleted. 
-  Autocompleted means the query was changed to the hint. The datum used for 
-  autocompletion is passed to the event handler as an argument in addition to 
-  the name of the dataset it belongs to.
-
-All custom events are triggered on the element initialized as a typeahead.
-
-### Look and Feel
-
-Below is a faux mustache template describing the DOM structure of a typeahead 
-dropdown menu. Keep in mind that `header`, `footer`, `suggestion`, and `empty` 
-come from the provided templates detailed [here](#datasets). 
-
-```html
-<span class="tt-dropdown-menu">
-  {{#datasets}}
-    <div class="tt-dataset-{{name}}">
-      {{{header}}}
-      <span class="tt-suggestions">
-        {{#suggestions}}
-          <div class="tt-suggestion">{{{suggestion}}}</div>
-        {{/suggestions}}
-        {{^suggestions}}
-          {{{empty}}}
-        {{/suggestions}}
-      </span>
-      {{{footer}}}
-    </div>
-  {{/datasets}}
-</span>
-```
-
-When an end-user mouses or keys over a `.tt-suggestion`, the class `tt-cursor` 
-will be added to it. You can use this class as a hook for styling the "under 
-cursor" state of suggestions.
-
-Bloodhound
-----------
-
-Bloodhounds are the data components responsible for computing a set of
-suggestions for a given query. They're robust, flexible, and offer advanced 
-functionality such as prefetching, intelligent caching, fast lookups, and 
-backfilling with remote data.
-
-### Bloodhound API
-
-#### Constructor
-
-The constructor function. It takes an [options hash](#bloodhound-options).
-
-```javascript
-var bloodhound = new Bloodhound({
-  name: 'animals',
-  local: ['dog', 'pig', 'moose'],
-  remote: 'http://example.com/animals?q=%QUERY'
-});
-```
-
-#### Bloodhound#initialize()
-
-Kicks off the initialization of the bloodhound. This includes processing the 
-data provided through `local` and fetching and processing the data provided by 
-`prefetch`. `Bloodhound#get` will be useless until the bloodhound has been
-intialized. Returns a [jQuery promise] which is resolved when the fetching and 
-processing has finished.
-
-```javascript
-bloodhound.initialize();
-```
-
-<!-- section links -->
-
-[jQuery promise]: http://api.jquery.com/Types/#Promise
-
-#### Bloodhound#get(query, cb)
-
-Retrieves suggestions for `query` and invokes `cb` with them. `cb` will always 
-be called at least once with the mixed results from `local` and `prefetch`. If 
-those results are insufficent, `cb` will be called again later with the mixed 
-results from `local`, `prefetch`, **and** `remote`.
-
-```javascript
-bloodhound.get(myQuery, function(suggestions) {
-  suggestions.each(function(suggestion) {
-    console.log(suggestion.value);
-  });
-});
-```
-
-### Bloodhound Options
-
-When initializing a Bloodhound, there are a number of options you can 
-configure.
-
-* `valueKey` – The key used to access the value of the datum in the datum 
-  object. Defaults to `value`.
-
-* `limit` – The max number of suggestions to return from `Bloodhound#get`. If 
-  not reached, the data source will attempt to backfill the suggestions from 
-  `remote`.
-
-* `tokenizer` – A function with the signature `(str)` that returns an array of
-  tokens. The default implementation of `tokenizer` splits `str` on whitespace.
-
-* `dupDetector` – This is used for making sure no duplicate suggestions are 
-  introduced from `remote`. Expected to be either `true`, `false`, or a 
-  function with the signature `(datum1, datum2)` that returns `true` if the 
-  datums are duplicates or `false` otherwise. If set to `true`, a function that 
-  compares value properties will be used. If set to `false`, duplicate 
-  detection will not be performed.
-
-* `sorter` – A [compare function] used to sort matched datums for a given query.
-
-* `local` – An array of [datums](#datum).
-
-* `prefetch` – Can be a URL to a JSON file containing an array of datums or, if 
-  more configurability is needed, a [prefetch options hash](#prefetch).
-
-* `remote` – Can be a URL to fetch suggestions from when the data provided by 
-  `local` and `prefetch` is insufficient or, if more configurability is needed, 
-  a [remote options hash](#remote).
-
-<!-- section links -->
-
-[compare function]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort
-
-### Prefetch
-
-Prefetched data is fetched and processed on initialization. If the browser 
-supports local storage, the processed data will be cached there to 
-prevent additional network requests on subsequent page loads.
-
-When configuring `prefetch`, the following options are available.
-
-* `url` – A URL to a JSON file containing an array of datums. **Required.**
-
-* `cacheKey` – The key that data will be stored in local storage under. 
-  Defaults to `url`.
-
-* `ttl` – The time (in milliseconds) the prefetched data should be cached in 
-  local storage. Defaults to `86400000` (1 day).
-
-* `thumbprint` – A string used for thumbprinting prefetched data. If this
-  doesn't match what's stored in local storage, the data will be refetched.
-
-* `filter` – A function with the signature `filter(parsedResponse)` that 
-  transforms the response body into an array of datums. Expected to return an 
-  array of datums.
-
-* `ajax` – The [ajax settings object] passed to `jQuery.ajax`.
-
-<!-- section links -->
-
-[ajax settings object]:http://api.jquery.com/jQuery.ajax/#jQuery-ajax-settings
-
-### Remote
-
-Remote data is only used when the data provided by `local` and `prefetch` is 
-insufficient. In order to prevent an obscene number of requests being made to
-the remote endpoint, typeahead.js rate-limits remote requests.
-
-When configuring `remote`, the following options are available.
-
-* `url` – A URL to make requests to when when the data provided by `local` and 
-  `prefetch` is insufficient. **Required.**
-
-* `wildcard` – The pattern in `url` that will be replaced with the user's query 
-  when a request is made. Defaults to `%QUERY`.
-
-* `replace` – A function with the signature `replace(url, query)` that can be 
-  used to override the request URL. Expected to return a valid URL. If set, no 
-  `wildcard` substitution will be performed on `url`.
-
-* `rateLimitBy` – The method used to rate-limit network requests. Can be either 
-  `debounce` or `throttle`. Defaults to `debounce`.
-
-* `rateLimitWait` – The time interval in milliseconds that will be used by 
-  `rateLimitBy`. Defaults to `300`.
-
-* `filter` – A function with the signature `filter(parsedResponse)` that 
-  transforms the response body into an array of datums. Expected to return an 
-  array of datums.
-
-* `ajax` – The [ajax settings object] passed to `jQuery.ajax`.
-
-<!-- section links -->
-
-[ajax settings object]: http://api.jquery.com/jQuery.ajax/#jQuery-ajax-settings
-
-### Tokens
-
-The algorithm used by bloodhounds for providing suggestions for a given query 
-is token-based. When `Bloodhound#get` is called, it tokenizes `query` using 
-`tokenizer` and then invokes `cb` with all of the datums that contain those 
-tokens.
-
-By default, a bloodhound will generate tokens for a datum by tokenizing its 
-value with `tokenizer`. However, it is possible to explicitly set the tokens 
-for a datum by including a `tokens` property.
-
-```javascript
-{
-  value: 'typeahead.js'
-  tokens: ['typeahead.js', 'typeahead', 'autocomlete', 'javascript'];
-}
-```
-
-The above datum would be a valid suggestion for queries such as:
-
-* `typehead`
-* `typehead.js`
-* `autoco`
-* `java type`
-
-Datum
------
-
-The data representation of a suggestion is referred to as a datum. A datum is
-an object that can contain arbitrary properties. When a suggestion is 
-rendered, its datum will be the context passed the precompiled suggestion 
-template.
-
-Datums are expected to contain a value property – when a suggestion is 
-selected, this will be what the value of the `input` is set to. By default,
-it's expected the name of this property will be `value`, but it's configurable.
-See [Bloodhound Options](#bloodhound-options) for more details.
-
-For ease of use, datums can also be represented as a string. Strings found in 
-place of datum objects are implicitly converted to an object with its value
-property set to the string.
-
-Here's a datum in its simplest form.
-
-```javascript
-{
-  value: "monkey"
-}
-```
-
-Here's a more complex datum that would be used for a Twitter account 
-typeahead. The value property here is `handle` and the datum contains additional
-properties to make it possible to render richer suggestions. This datum also
-explicitly sets its [tokens](#tokens).
-
-```javascript
-{
-  name: 'Jake Harding',
-  handle: '@JakeHarding',
-  tokens: ['jake', 'harding', 'jakeharding', '@jakeharding'],
-  profileImageUrl: 'https://twitter.com/JakeHaridng/path/to/img'
-}
-```
-
 Browser Support
 ---------------
 
@@ -520,6 +79,8 @@ Browser Support
 * Internet Explorer 7+
 * Opera 11+
 
+**NOTE:** typeahead.js is not tested on mobile browers.
+
 Customer Support
 ----------------
 
diff --git a/doc/bloodhound.md b/doc/bloodhound.md
new file mode 100644
index 00000000..d03cf075
--- /dev/null
+++ b/doc/bloodhound.md
@@ -0,0 +1,204 @@
+Bloodhound
+==========
+
+Bloodhound is the typeahead.js suggestion engine. Bloodhound is robust, 
+flexible, and offers advanced functionalities such as prefetching, intelligent
+caching, fast lookups, and backfilling with remote data.
+
+Table of Contents
+-----------------
+
+* [Features](#features)
+* [Usage](#usage)
+  * [API](#api)
+  * [Options](#options)
+  * [Prefetch](#prefetch)
+  * [Remote](#remote)
+  * [Datums](#datums)
+  * [Tokens](#tokens)
+
+Features
+--------
+
+* Works with hardcoded data
+* Prefetches data on initialization to reduce suggestion latency
+* Uses local storage intelligently to cut down on network requests
+* Backfills suggestions from a remote source
+* Rate-limits and caches network requests to remote sources to lighten the load
+
+Usage
+-----
+
+### API
+
+#### new Bloodhound(options)
+
+The constructor function. It takes an [options hash](#options) as its only 
+argument.
+
+```javascript
+var engine = new Bloodhound({
+  name: 'animals',
+  local: [{ val: 'dog' }, { val: 'pig' }, { val: 'moose' }],
+  remote: 'http://example.com/animals?q=%QUERY'
+});
+```
+
+#### Bloodhound#initialize()
+
+Kicks off the initialization of the suggestion engine. This includes processing 
+the data provided through `local` and fetching/processing the data provided 
+through `prefetch`. Until initialized, all other methods will behave as no-ops.
+Returns a [jQuery promise] which is resolved when engine has been initialized.
+
+```javascript
+var promise = engine.initialize();
+
+promise
+.done(function() { console.log('success!'); })
+.fail(function() { console.log('err!'); });
+```
+
+<!-- section links -->
+
+[jQuery promise]: http://api.jquery.com/Types/#Promise
+
+#### Bloodhound#get(query, cb)
+
+Computes a set of suggestions for `query`. `cb` will be invoked with an array
+of datums that represent said set. `cb` will always be invoked once 
+synchronously with suggestions that were available on the client. If those
+suggestions are insufficient and `remote` was configured, `cb` may also be 
+invoked asynchronously with the suggestions available on the client mixed with
+suggestions from the `remote` source.
+
+```javascript
+bloodhound.get(myQuery, function(suggestions) {
+  suggestions.each(function(suggestion) { console.log(suggestion); });
+});
+```
+
+### Options
+
+When instantiating a Bloodhound suggestion engine, there are a number of 
+options you can configure.
+
+* `datumTokenizer` – A function with the signature `(datum)` that transforms a
+  datum into an array of string tokens. **Required**.
+
+* `queryTokenizer` – A function with the signature `(query)` that transforms a
+  query into an array of string tokens. **Required**.
+
+* `limit` – The max number of suggestions to return from `Bloodhound#get`. If 
+  not reached, the data source will attempt to backfill the suggestions from 
+  `remote`.
+
+* `dupDetector` – If set, this is expected to be a function with the signature 
+  `(datum1, datum2)` that returns `true` if the datums are duplicates or 
+  `false` otherwise. If not set, duplicate detection will not be performed.
+
+* `sorter` – A [compare function] used to sort matched datums for a given query.
+
+* `local` – An array of [datums](#datum).
+
+* `prefetch` – Can be a URL to a JSON file containing an array of datums or, if 
+  more configurability is needed, a [prefetch options hash](#prefetch).
+
+* `remote` – Can be a URL to fetch suggestions from when the data provided by 
+  `local` and `prefetch` is insufficient or, if more configurability is needed, 
+  a [remote options hash](#remote).
+
+<!-- section links -->
+
+[compare function]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort
+
+### Prefetch
+
+Prefetched data is fetched and processed on initialization. If the browser 
+supports local storage, the processed data will be cached there to 
+prevent additional network requests on subsequent page loads.
+
+When configuring `prefetch`, the following options are available.
+
+* `url` – A URL to a JSON file containing an array of datums. **Required.**
+
+* `cacheKey` – The key that data will be stored in local storage under. 
+  Defaults to value of `url`.
+
+* `ttl` – The time (in milliseconds) the prefetched data should be cached in 
+  local storage. Defaults to `86400000` (1 day).
+
+* `thumbprint` – A string used for thumbprinting prefetched data. If this
+  doesn't match what's stored in local storage, the data will be refetched.
+
+* `filter` – A function with the signature `filter(parsedResponse)` that 
+  transforms the response body into an array of datums. Expected to return an 
+  array of datums.
+
+* `ajax` – The [ajax settings object] passed to `jQuery.ajax`.
+
+<!-- section links -->
+
+[ajax settings object]:http://api.jquery.com/jQuery.ajax/#jQuery-ajax-settings
+
+### Remote
+
+Remote data is only used when the data provided by `local` and `prefetch` is 
+insufficient. In order to prevent an obscene number of requests being made to
+the remote endpoint, requests are rate-limited.
+
+When configuring `remote`, the following options are available.
+
+* `url` – A URL to make requests to when when the data provided by `local` and 
+  `prefetch` is insufficient. **Required.**
+
+* `wildcard` - The pattern in `url` that will be replaced with the user's query 
+  when a request is made. Defaults to `%QUERY`. 
+
+* `replace` – A function with the signature `replace(url, query)` that can be 
+  used to override the request URL. Expected to return a valid URL. If set, no 
+  wildcard substitution will be performed on `url`.
+
+* `rateLimitBy` – The method used to rate-limit network requests. Can be either 
+  `debounce` or `throttle`. Defaults to `debounce`.
+
+* `rateLimitWait` – The time interval in milliseconds that will be used by 
+  `rateLimitBy`. Defaults to `300`.
+
+* `filter` – A function with the signature `filter(parsedResponse)` that 
+  transforms the response body into an array of datums. Expected to return an 
+  array of datums.
+
+* `ajax` – The [ajax settings object] passed to `jQuery.ajax`.
+
+<!-- section links -->
+
+[ajax settings object]: http://api.jquery.com/jQuery.ajax/#jQuery-ajax-settings
+
+### Datums
+
+Datums are JavaScript objects the hydrate the pool of possible suggestions.
+Bloodhound doesn't expect datums to contain any specific properties as any
+operations performed on datums are done using functions defined by the user i.e.
+`datumTokenizer`, `dupDetector`, and `sorter`.
+
+### Tokens
+
+The algorithm used by bloodhounds for providing suggestions for a given query 
+is token-based. When `Bloodhound#get` is called, it tokenizes `query` using 
+`queryTokenizer` and then invokes `cb` with all of the datums that contain those 
+tokens.
+
+For a quick example, if a datum was tokenized into the following set of 
+tokens...
+
+```javascript
+['typeahead.js', 'typeahead', 'autocomlete', 'javascript'];
+```
+
+...it would be a valid match for queries such as:
+
+* `typehead`
+* `typehead.js`
+* `autoco`
+* `java type`
diff --git a/doc/jquery_typeahead.md b/doc/jquery_typeahead.md
new file mode 100644
index 00000000..8b7f012b
--- /dev/null
+++ b/doc/jquery_typeahead.md
@@ -0,0 +1,239 @@
+jQuery#typeahead
+----------------
+
+The UI component of typeahead.js is a available as a jQuery plugin. It's 
+responsible for rendering suggestions and handling DOM interactions.
+
+Table of Contents
+-----------------
+
+* [Features](#features)
+* [Usage](#usage)
+  * [API](#api)
+  * [Options](#options)
+  * [Datasets](#datasets)
+  * [Custom Events](#custom-events)
+  * [Look and Feel](#look-and-feel)
+* [Bloodhound Integration](#bloodhound-integration)
+
+Features
+--------
+
+* Displays suggestions to end-users as they type
+* Shows top suggestion as a hint (i.e. background text)
+* Supports custom templates to allow for UI flexibility
+* Works well with RTL languages and input method editors
+* Highlights query matches within the suggestion
+* Triggers custom events
+
+Usage
+-----
+
+### API
+
+#### jQuery#typeahead(options, [\*datasets])
+
+Turns any `input[type="text"]` element into a typeahead. `options` is an 
+options hash that's used to configure the typeahead to your liking. Refer to 
+[Options](#options) for more info regarding the available configs. Subsequent 
+arguments (`*datasets`), are individual option hashes for datasets. For more 
+details regarding datasets, refer to [Datasets](#datasets).
+
+```javascript
+$('.typeahead').typeahead({
+  minLength: 3,
+  hightlight: true,
+},
+{
+  name: 'my-dataset',
+  source: mySource
+});
+```
+
+#### jQuery#typeahead('destroy')
+
+Removes typeahead functionality and reverts the `input` element back to its 
+original state.
+
+```javascript
+$('.typeahead').typeahead('destroy');
+```
+
+#### jQuery#typeahead('open')
+
+Opens the dropdown menu of typeahead. Note that being open does not mean that
+the menu is visible. The menu is only visible when it is open and has content.
+
+```javascript
+$('.typeahead').typeahead('open');
+```
+
+#### jQuery#typeahead('close')
+
+Closes the dropdown menu of typeahead.
+
+```javascript
+$('.typeahead').typeahead('close');
+```
+
+#### jQuery#typeahead('val')
+
+Returns the current value of the typeahead. The value is the text the user has 
+entered into the `input` element.
+
+```javascript
+var myVal = $('.typeahead').typeahead('val');
+```
+
+#### jQuery#typeahead('val', val)
+
+Sets the value of the typeahead. This should be used in place of `jQuery#val`.
+
+```javascript
+$('.typeahead').typeahead('val', myVal);
+```
+
+### Options
+
+When initializing a typeahead, there are a number of options you can configure.
+
+* `autoselect` – If `true`, defaults the suggestion selection to the top 
+  suggestion when the user keys enter while the dropdown menu is open. Defaults
+  to `false`.
+
+* `highlight` – If `true`, when suggestions are rendered, pattern matches
+  for the current query in text nodes will be wrapped in a `strong` element. 
+  Defaults to `false`.
+
+* `hint` – If `false`, the typeahead will not show a hint. Defaults to `true`.
+
+* `minLength` – The minimum character length needed before suggestions start 
+  getting rendered. Defaults to `1`.
+
+### Datasets
+
+A typeahead is composed of one or more datasets. When an end-user modifies the
+value of a typeahead, each dataset will attempt to render suggestions for the
+new value. 
+
+For most use cases, one dataset should suffice. It's only in the scenario where
+you want rendered suggestions to be grouped in the dropdown menu based on some 
+sort of categorical relationship that you'd need to use multiple datasets. For
+example, on twitter.com, the search typeahead groups results into recent 
+searches, trends, and accounts – that would be a great use case for using 
+multiple datasets.
+
+Datasets can be configured using the following options.
+
+* `source` – The backing data source for suggestions. Expected to be a function 
+  with the signature `(query, cb)`. It is expected that the function will 
+  compute the suggestion set (i.e. an array of JavaScript objects) for `query` 
+  and then invoke `cb` with said set. `cb` can be invoked synchronously or 
+  asynchronously. A Bloodhound suggestion engine can be used here, to learn 
+  how, see [Bloodhound Integration](#bloodhound-integration). **Required**.
+
+* `name` – The name of the dataset. This will be appended to `tt-dataset-` to 
+  form the class name of the containing DOM element. Defaults to a random 
+  number.
+
+* `displayKey` – The key used to access a suggestion object's string 
+  representation. If a suggestion is selected, its string representation is 
+  what the typeahead's value is set to. Defaults to `value`.
+
+* `templates` – A hash of templates to be used when rendering the dataset. Note
+  a precompiled template is a function that takes a JavaScript object as its
+  first argument and returns a HTML string.
+
+  * `empty` – Rendered when `0` suggestions are available for the given query. 
+  Can be either a HTML string or a precompiled template. If it's a precompiled
+  template, the passed in context will contain `query`.
+
+  * `footer`– Rendered at the bottom of the dataset. Can be either a HTML 
+  string or a precompiled template. If it's a precompiled template, the passed 
+  in context will contain `query` and `isEmpty`.
+
+  * `header` – Rendered at the top of the dataset. Can be either a HTML string 
+  or a precompiled template. If it's a precompiled template, the passed in 
+  context will contain `query` and `isEmpty`.
+
+  * `suggestion` – Used to render a single suggestion. If set, this has to be a 
+  precompiled template. The associated suggestion object will serve as the 
+  context. Defaults to the value of `displayKey` wrapped in a `p` tag i.e. 
+  `<p>{{value}}</p>`.
+
+### Custom Events
+
+The typeahead component triggers the following custom events.
+
+* `typeahead:opened` – Triggered when the dropdown menu of a typeahead is 
+  opened.
+
+* `typeahead:closed` – Triggered when the dropdown menu of a typeahead is 
+  closed.
+
+* `typeahead:cursorchanged` – Triggered when the dropdown menu cursor is moved
+  to a different suggestion. The event handler will be invoked with 3 
+  arguments: the jQuery event object, the suggestion object, and the name of 
+  the dataset the suggestion belongs to.
+
+* `typeahead:selected` – Triggered when a suggestion from the dropdown menu is 
+  selected. The event handler will be invoked with 3 arguments: the jQuery 
+  event object, the suggestion object, and the name of the dataset the 
+  suggestion belongs to.
+
+* `typeahead:autocompleted` – Triggered when the query is autocompleted. 
+  Autocompleted means the query was changed to the hint. The event handler will 
+  be invoked with 3 arguments: the jQuery event object, the suggestion object, 
+  and the name of the dataset the suggestion belongs to. 
+
+All custom events are triggered on the element initialized as a typeahead.
+
+### Look and Feel
+
+Below is a faux mustache template describing the DOM structure of a typeahead 
+dropdown menu. Keep in mind that `header`, `footer`, `suggestion`, and `empty` 
+come from the provided templates detailed [here](#datasets). 
+
+```html
+<span class="tt-dropdown-menu">
+  {{#datasets}}
+    <div class="tt-dataset-{{name}}">
+      {{{header}}}
+      <span class="tt-suggestions">
+        {{#suggestions}}
+          <div class="tt-suggestion">{{{suggestion}}}</div>
+        {{/suggestions}}
+        {{^suggestions}}
+          {{{empty}}}
+        {{/suggestions}}
+      </span>
+      {{{footer}}}
+    </div>
+  {{/datasets}}
+</span>
+```
+
+When an end-user mouses or keys over a `.tt-suggestion`, the class `tt-cursor` 
+will be added to it. You can use this class as a hook for styling the "under 
+cursor" state of suggestions.
+
+Bloodhound Integration
+----------------------
+
+Because datasets expect their `source` to be a function, you cannot directly
+pass a Bloodhound suggestion engine in as `source`. Rather, you'll need to 
+pass the suggestion engine's typeahead adapter:
+
+```javascript
+var engine = new Bloodhound({ /* options */ });
+
+$('.typeahead').typeahead(null, {
+  source: engine.ttAdapter()
+});
+
+// or if you don't need to keep around a reference to the suggestion engine,
+// you can just do this
+$('.typeahead').typeahead(null, {
+  source: (new Bloodhound({ /* options */ })).ttAdapter()
+});
+```

From c026271b9dc359bacae2191642ae52954e3af4c0 Mon Sep 17 00:00:00 2001
From: Jake Harding <jharding@twitter.com>
Date: Sat, 1 Feb 2014 22:21:44 -0800
Subject: [PATCH 10/17] Add a whitespace and non-word tokenizers.

---
 src/bloodhound/bloodhound.js | 13 +++++++++++++
 test/playground.html         | 20 +++++++++++++-------
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/bloodhound/bloodhound.js b/src/bloodhound/bloodhound.js
index 2ce1f4df..c1b1c315 100644
--- a/src/bloodhound/bloodhound.js
+++ b/src/bloodhound/bloodhound.js
@@ -39,6 +39,19 @@ var Bloodhound = window.Bloodhound = (function() {
     this.storage = this.cacheKey ? new PersistentStorage(this.cacheKey) : null;
   }
 
+  // static methods
+  // --------------
+
+  Bloodhound.tokenizers = {
+    whitespace: function whitespaceTokenizer(s) {
+      return s.split(/\s+/);
+    },
+
+    nonword: function nonwordTokenizer(s) {
+      return s.split(/\W+/);
+    }
+  };
+
   // instance methods
   // ----------------
 
diff --git a/test/playground.html b/test/playground.html
index 682a6824..103e5622 100644
--- a/test/playground.html
+++ b/test/playground.html
@@ -51,8 +51,10 @@
 
     <script>
       var states = new Bloodhound({
-        datumTokenizer: function(d) { return d.val.split(/\s+/); },
-        queryTokenizer: function(q) { return q.split(/\s+/); },
+        datumTokenizer: function(d) { 
+          return Bloodhound.tokenizers.whitespace(d.val); 
+        },
+        queryTokenizer: Bloodhound.tokenizers.whitespace,
         local: [
           { val: 'Alabama' },
           { val: 'Alaska' },
@@ -120,7 +122,7 @@
 
       var badTokens = new Bloodhound({
         datumTokenizer: function(d) { return d.tokens; },
-        queryTokenizer: function(q) { return q.split(/\s+/); },
+        queryTokenizer: Bloodhound.tokenizers.whitespace,
         local: [
           {
             value1: 'all bad',
@@ -158,8 +160,10 @@
       });
 
       var regexSymbols = new Bloodhound({
-        datumTokenizer: function(d) { return d.val.split(/\s+/); },
-        queryTokenizer: function(q) { return q.split(/\s+/); },
+        datumTokenizer: function(d) { 
+          return Bloodhound.tokenizers.whitespace(d.val); 
+        },
+        queryTokenizer: Bloodhound.tokenizers.whitespace,
         local: [
           { val: '*.js' },
           { val: '[Tt]ypeahead.js' },
@@ -178,8 +182,10 @@
       });
 
       var abc = new Bloodhound({
-        datumTokenizer: function(d) { return d.val.split(/\s+/); },
-        queryTokenizer: function(q) { return q.split(/\s+/); },
+        datumTokenizer: function(d) { 
+          return Bloodhound.tokenizers.whitespace(d.val); 
+        },
+        queryTokenizer: Bloodhound.tokenizers.whitespace,
         local: [
           { val: 'a' }, 
           { val: 'ab' }, 

From e036d1b74b4c857eea313a6ef5171531ddec6c66 Mon Sep 17 00:00:00 2001
From: Jake Harding <jharding@twitter.com>
Date: Sun, 2 Feb 2014 00:03:24 -0800
Subject: [PATCH 11/17] Fix SearchIndex#get bug.

---
 src/bloodhound/search_index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/bloodhound/search_index.js b/src/bloodhound/search_index.js
index 85f27522..e66f2327 100644
--- a/src/bloodhound/search_index.js
+++ b/src/bloodhound/search_index.js
@@ -87,6 +87,7 @@ var SearchIndex = (function() {
 
         // break early if we find out there are no possible matches
         else {
+          matches = [];
           return false;
         }
       });

From cbbab283af424723eac3bf27cfe822acf434303d Mon Sep 17 00:00:00 2001
From: Jake Harding <jharding@twitter.com>
Date: Sun, 2 Feb 2014 00:43:02 -0800
Subject: [PATCH 12/17] Add test case for removing duplicates.

---
 test/bloodhound_spec.js | 37 ++++++++++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/test/bloodhound_spec.js b/test/bloodhound_spec.js
index 1edbe595..57ffc1d1 100644
--- a/test/bloodhound_spec.js
+++ b/test/bloodhound_spec.js
@@ -276,6 +276,39 @@ describe('Bloodhound', function() {
   });
 
   describe('local/prefetch/remote integration', function() {
+    it('duplicates should be removed if dupDetector is provided', function() {
+      var spy;
+
+      spy = jasmine.createSpy();
+
+      this.bloodhound = new Bloodhound({
+        limit: 6,
+        datumTokenizer: datumTokenizer,
+        queryTokenizer: queryTokenizer,
+        dupDetector: function(d1, d2) { return d1.value === d2.value; },
+        local: fixtures.data.animals,
+        remote: { url: '/test?q=%QUERY' }
+      });
+
+      this.bloodhound.initialize();
+
+      this.bloodhound.transport.get.andCallFake(fakeGet);
+
+      this.bloodhound.get('dog', spy);
+
+      expect(spy).toHaveBeenCalledWith([{ value: 'dog' }]);
+
+      waitsFor(function() { return spy.callCount === 2; });
+
+      runs(function() {
+        expect(spy).toHaveBeenCalledWith(fixtures.data.animals);
+      });
+
+      function fakeGet(url, o, cb) {
+        setTimeout(function() { cb(fixtures.data.animals); }, 0);
+      }
+    });
+
     it('remote should backfill local/prefetch', function() {
       var spy1, spy2;
 
@@ -320,9 +353,7 @@ describe('Bloodhound', function() {
       });
 
       function fakeGet(url, o, cb) {
-        setTimeout(function() {
-          cb(fixtures.data.animals);
-        }, 0);
+        setTimeout(function() { cb(fixtures.data.animals); }, 0);
       }
     });
   });

From 2af18d52a49f4cfabe21d1136ac8f0bc5ef96fbc Mon Sep 17 00:00:00 2001
From: Jake Harding <jharding@twitter.com>
Date: Sun, 2 Feb 2014 00:48:14 -0800
Subject: [PATCH 13/17] Some jshint cleanup.

---
 Gruntfile.js          | 2 +-
 src/common/utils.js   | 4 ++--
 src/typeahead/html.js | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index b84e3f78..7aada407 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -98,7 +98,7 @@ module.exports = function(grunt) {
       options: {
         jshintrc: '.jshintrc'
       },
-      src: 'src/**/*',
+      src: 'src/**/*.js',
       test: ['test/*_spec.js'],
       gruntfile: ['Gruntfile.js']
     },
diff --git a/src/common/utils.js b/src/common/utils.js
index 164cf9a2..20a7bd85 100644
--- a/src/common/utils.js
+++ b/src/common/utils.js
@@ -7,8 +7,8 @@
 var _ = {
   isMsie: function() {
     // from https://github.com/ded/bowser/blob/master/bowser.js
-    return /(msie|trident)/i.test(navigator.userAgent) ?
-      navigator.userAgent.match(/(msie |rv:)(\d+(.\d+)?)/i)[2] : false
+    return (/(msie|trident)/i).test(navigator.userAgent) ?
+      navigator.userAgent.match(/(msie |rv:)(\d+(.\d+)?)/i)[2] : false;
   },
 
   isBlankString: function(str) { return !str || /^\s*$/.test(str); },
diff --git a/src/typeahead/html.js b/src/typeahead/html.js
index 6061cf36..49c3d7e6 100644
--- a/src/typeahead/html.js
+++ b/src/typeahead/html.js
@@ -9,5 +9,5 @@ var html = {
   dropdown: '<span class="tt-dropdown-menu"></span>',
   dataset: '<div class="tt-dataset-%CLASS%"></div>',
   suggestions: '<span class="tt-suggestions"></span>',
-  suggestion: '<div class="tt-suggestion">%BODY%</div>',
+  suggestion: '<div class="tt-suggestion">%BODY%</div>'
 };

From 34bf5815666d36fa4c724933669f358f2b8b5736 Mon Sep 17 00:00:00 2001
From: Jake Harding <jharding@twitter.com>
Date: Sun, 2 Feb 2014 00:54:35 -0800
Subject: [PATCH 14/17] Fix doc typo.

---
 doc/jquery_typeahead.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/jquery_typeahead.md b/doc/jquery_typeahead.md
index 8b7f012b..37fcf81b 100644
--- a/doc/jquery_typeahead.md
+++ b/doc/jquery_typeahead.md
@@ -227,6 +227,8 @@ pass the suggestion engine's typeahead adapter:
 ```javascript
 var engine = new Bloodhound({ /* options */ });
 
+engine.initialize();
+
 $('.typeahead').typeahead(null, {
   source: engine.ttAdapter()
 });

From cf63b0d77fd558cd2ba170bc3ad0d2e781195ddc Mon Sep 17 00:00:00 2001
From: Jake Harding <jharding@twitter.com>
Date: Sun, 2 Feb 2014 01:12:59 -0800
Subject: [PATCH 15/17] Clarify what insufficient means in the docs.

---
 doc/bloodhound.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/bloodhound.md b/doc/bloodhound.md
index d03cf075..c12c774c 100644
--- a/doc/bloodhound.md
+++ b/doc/bloodhound.md
@@ -68,7 +68,7 @@ promise
 Computes a set of suggestions for `query`. `cb` will be invoked with an array
 of datums that represent said set. `cb` will always be invoked once 
 synchronously with suggestions that were available on the client. If those
-suggestions are insufficient and `remote` was configured, `cb` may also be 
+suggestions are insufficient (# of suggestions is less than `limit`) and `remote` was configured, `cb` may also be 
 invoked asynchronously with the suggestions available on the client mixed with
 suggestions from the `remote` source.
 

From 64c4a4d7b6b1687f9a3830ed42d94078a8b8b7fd Mon Sep 17 00:00:00 2001
From: Jake Harding <jharding@twitter.com>
Date: Sun, 2 Feb 2014 01:46:35 -0800
Subject: [PATCH 16/17] Change some dist file names.

---
 Gruntfile.js          |    2 +-
 README.md             |    8 +-
 dist/typeahead.js     | 1139 -----------------------------------------
 dist/typeahead.min.js |    7 -
 4 files changed, 5 insertions(+), 1151 deletions(-)
 delete mode 100644 dist/typeahead.js
 delete mode 100644 dist/typeahead.min.js

diff --git a/Gruntfile.js b/Gruntfile.js
index 7aada407..547ba877 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -62,7 +62,7 @@ module.exports = function(grunt) {
           compress: false
         },
         src: files.common.concat(files.typeahead),
-        dest: '<%= buildDir %>/typeahead.js'
+        dest: '<%= buildDir %>/typeahead.jquery.js'
 
       },
       bundle: {
diff --git a/README.md b/README.md
index e20026ba..47dd098d 100644
--- a/README.md
+++ b/README.md
@@ -35,11 +35,11 @@ Other methods:
 * [Download zipball of latest release][zipball].
 * Download the latest dist files individually:
   * *[bloodhound.js]* (standalone suggestion engine)
-  * *[typeahead.js]* (standalone UI view)
-  * *[typeahead.bundle.js]* (*bloodhound.js* + *typeahead.js*)
+  * *[typeahead.jquery.js]* (standalone UI view)
+  * *[typeahead.bundle.js]* (*bloodhound.js* + *typeahead.jquery.js*)
   * *[typeahead.bundle.min.js]*
 
-**Note:** both *bloodhound.js* and *typeahead.js* have a dependency on 
+**Note:** both *bloodhound.js* and *typeahead.jquery.js* have a dependency on 
 [jQuery] 1.9+.
 
 <!-- section links -->
@@ -47,7 +47,7 @@ Other methods:
 [Bower]: http://bower.io/
 [zipball]: http://twitter.github.com/typeahead.js/releases/latest/typeahead.js.zip
 [bloodhound.js]: http://twitter.github.com/typeahead.js/releases/latest/bloodhound.js
-[typeahead.js]: http://twitter.github.com/typeahead.js/releases/latest/typeahead.js
+[typeahead.jquery.js]: http://twitter.github.com/typeahead.js/releases/latest/typeahead.jquery.js
 [typeahead.bundle.js]: http://twitter.github.com/typeahead.js/releases/latest/typeahead.bundle.js
 [typeahead.bundle.min.js]: http://twitter.github.com/typeahead.js/releases/latest/typeahead.bundle.min.js
 [jQuery]: http://jquery.com/
diff --git a/dist/typeahead.js b/dist/typeahead.js
deleted file mode 100644
index 9365bd62..00000000
--- a/dist/typeahead.js
+++ /dev/null
@@ -1,1139 +0,0 @@
-/*!
- * typeahead.js 0.9.3
- * https://github.com/twitter/typeahead
- * Copyright 2013 Twitter, Inc. and other contributors; Licensed MIT
- */
-
-(function($) {
-    var VERSION = "0.9.3";
-    var utils = {
-        isMsie: function() {
-            var match = /(msie) ([\w.]+)/i.exec(navigator.userAgent);
-            return match ? parseInt(match[2], 10) : false;
-        },
-        isBlankString: function(str) {
-            return !str || /^\s*$/.test(str);
-        },
-        escapeRegExChars: function(str) {
-            return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
-        },
-        isString: function(obj) {
-            return typeof obj === "string";
-        },
-        isNumber: function(obj) {
-            return typeof obj === "number";
-        },
-        isArray: $.isArray,
-        isFunction: $.isFunction,
-        isObject: $.isPlainObject,
-        isUndefined: function(obj) {
-            return typeof obj === "undefined";
-        },
-        bind: $.proxy,
-        bindAll: function(obj) {
-            var val;
-            for (var key in obj) {
-                $.isFunction(val = obj[key]) && (obj[key] = $.proxy(val, obj));
-            }
-        },
-        indexOf: function(haystack, needle) {
-            for (var i = 0; i < haystack.length; i++) {
-                if (haystack[i] === needle) {
-                    return i;
-                }
-            }
-            return -1;
-        },
-        each: $.each,
-        map: $.map,
-        filter: $.grep,
-        every: function(obj, test) {
-            var result = true;
-            if (!obj) {
-                return result;
-            }
-            $.each(obj, function(key, val) {
-                if (!(result = test.call(null, val, key, obj))) {
-                    return false;
-                }
-            });
-            return !!result;
-        },
-        some: function(obj, test) {
-            var result = false;
-            if (!obj) {
-                return result;
-            }
-            $.each(obj, function(key, val) {
-                if (result = test.call(null, val, key, obj)) {
-                    return false;
-                }
-            });
-            return !!result;
-        },
-        mixin: $.extend,
-        getUniqueId: function() {
-            var counter = 0;
-            return function() {
-                return counter++;
-            };
-        }(),
-        defer: function(fn) {
-            setTimeout(fn, 0);
-        },
-        debounce: function(func, wait, immediate) {
-            var timeout, result;
-            return function() {
-                var context = this, args = arguments, later, callNow;
-                later = function() {
-                    timeout = null;
-                    if (!immediate) {
-                        result = func.apply(context, args);
-                    }
-                };
-                callNow = immediate && !timeout;
-                clearTimeout(timeout);
-                timeout = setTimeout(later, wait);
-                if (callNow) {
-                    result = func.apply(context, args);
-                }
-                return result;
-            };
-        },
-        throttle: function(func, wait) {
-            var context, args, timeout, result, previous, later;
-            previous = 0;
-            later = function() {
-                previous = new Date();
-                timeout = null;
-                result = func.apply(context, args);
-            };
-            return function() {
-                var now = new Date(), remaining = wait - (now - previous);
-                context = this;
-                args = arguments;
-                if (remaining <= 0) {
-                    clearTimeout(timeout);
-                    timeout = null;
-                    previous = now;
-                    result = func.apply(context, args);
-                } else if (!timeout) {
-                    timeout = setTimeout(later, remaining);
-                }
-                return result;
-            };
-        },
-        tokenizeQuery: function(str) {
-            return $.trim(str).toLowerCase().split(/[\s]+/);
-        },
-        tokenizeText: function(str) {
-            return $.trim(str).toLowerCase().split(/[\s\-_]+/);
-        },
-        getProtocol: function() {
-            return location.protocol;
-        },
-        noop: function() {}
-    };
-    var EventTarget = function() {
-        var eventSplitter = /\s+/;
-        return {
-            on: function(events, callback) {
-                var event;
-                if (!callback) {
-                    return this;
-                }
-                this._callbacks = this._callbacks || {};
-                events = events.split(eventSplitter);
-                while (event = events.shift()) {
-                    this._callbacks[event] = this._callbacks[event] || [];
-                    this._callbacks[event].push(callback);
-                }
-                return this;
-            },
-            trigger: function(events, data) {
-                var event, callbacks;
-                if (!this._callbacks) {
-                    return this;
-                }
-                events = events.split(eventSplitter);
-                while (event = events.shift()) {
-                    if (callbacks = this._callbacks[event]) {
-                        for (var i = 0; i < callbacks.length; i += 1) {
-                            callbacks[i].call(this, {
-                                type: event,
-                                data: data
-                            });
-                        }
-                    }
-                }
-                return this;
-            }
-        };
-    }();
-    var EventBus = function() {
-        var namespace = "typeahead:";
-        function EventBus(o) {
-            if (!o || !o.el) {
-                $.error("EventBus initialized without el");
-            }
-            this.$el = $(o.el);
-        }
-        utils.mixin(EventBus.prototype, {
-            trigger: function(type) {
-                var args = [].slice.call(arguments, 1);
-                this.$el.trigger(namespace + type, args);
-            }
-        });
-        return EventBus;
-    }();
-    var PersistentStorage = function() {
-        var ls, methods;
-        try {
-            ls = window.localStorage;
-            ls.setItem("~~~", "!");
-            ls.removeItem("~~~");
-        } catch (err) {
-            ls = null;
-        }
-        function PersistentStorage(namespace) {
-            this.prefix = [ "__", namespace, "__" ].join("");
-            this.ttlKey = "__ttl__";
-            this.keyMatcher = new RegExp("^" + this.prefix);
-        }
-        if (ls && window.JSON) {
-            methods = {
-                _prefix: function(key) {
-                    return this.prefix + key;
-                },
-                _ttlKey: function(key) {
-                    return this._prefix(key) + this.ttlKey;
-                },
-                get: function(key) {
-                    if (this.isExpired(key)) {
-                        this.remove(key);
-                    }
-                    return decode(ls.getItem(this._prefix(key)));
-                },
-                set: function(key, val, ttl) {
-                    if (utils.isNumber(ttl)) {
-                        ls.setItem(this._ttlKey(key), encode(now() + ttl));
-                    } else {
-                        ls.removeItem(this._ttlKey(key));
-                    }
-                    return ls.setItem(this._prefix(key), encode(val));
-                },
-                remove: function(key) {
-                    ls.removeItem(this._ttlKey(key));
-                    ls.removeItem(this._prefix(key));
-                    return this;
-                },
-                clear: function() {
-                    var i, key, keys = [], len = ls.length;
-                    for (i = 0; i < len; i++) {
-                        if ((key = ls.key(i)).match(this.keyMatcher)) {
-                            keys.push(key.replace(this.keyMatcher, ""));
-                        }
-                    }
-                    for (i = keys.length; i--; ) {
-                        this.remove(keys[i]);
-                    }
-                    return this;
-                },
-                isExpired: function(key) {
-                    var ttl = decode(ls.getItem(this._ttlKey(key)));
-                    return utils.isNumber(ttl) && now() > ttl ? true : false;
-                }
-            };
-        } else {
-            methods = {
-                get: utils.noop,
-                set: utils.noop,
-                remove: utils.noop,
-                clear: utils.noop,
-                isExpired: utils.noop
-            };
-        }
-        utils.mixin(PersistentStorage.prototype, methods);
-        return PersistentStorage;
-        function now() {
-            return new Date().getTime();
-        }
-        function encode(val) {
-            return JSON.stringify(utils.isUndefined(val) ? null : val);
-        }
-        function decode(val) {
-            return JSON.parse(val);
-        }
-    }();
-    var RequestCache = function() {
-        function RequestCache(o) {
-            utils.bindAll(this);
-            o = o || {};
-            this.sizeLimit = o.sizeLimit || 10;
-            this.cache = {};
-            this.cachedKeysByAge = [];
-        }
-        utils.mixin(RequestCache.prototype, {
-            get: function(url) {
-                return this.cache[url];
-            },
-            set: function(url, resp) {
-                var requestToEvict;
-                if (this.cachedKeysByAge.length === this.sizeLimit) {
-                    requestToEvict = this.cachedKeysByAge.shift();
-                    delete this.cache[requestToEvict];
-                }
-                this.cache[url] = resp;
-                this.cachedKeysByAge.push(url);
-            }
-        });
-        return RequestCache;
-    }();
-    var Transport = function() {
-        var pendingRequestsCount = 0, pendingRequests = {}, maxPendingRequests, requestCache;
-        function Transport(o) {
-            utils.bindAll(this);
-            o = utils.isString(o) ? {
-                url: o
-            } : o;
-            requestCache = requestCache || new RequestCache();
-            maxPendingRequests = utils.isNumber(o.maxParallelRequests) ? o.maxParallelRequests : maxPendingRequests || 6;
-            this.url = o.url;
-            this.wildcard = o.wildcard || "%QUERY";
-            this.filter = o.filter;
-            this.replace = o.replace;
-            this.ajaxSettings = {
-                type: "get",
-                cache: o.cache,
-                timeout: o.timeout,
-                dataType: o.dataType || "json",
-                beforeSend: o.beforeSend
-            };
-            this._get = (/^throttle$/i.test(o.rateLimitFn) ? utils.throttle : utils.debounce)(this._get, o.rateLimitWait || 300);
-        }
-        utils.mixin(Transport.prototype, {
-            _get: function(url, cb) {
-                var that = this;
-                if (belowPendingRequestsThreshold()) {
-                    this._sendRequest(url).done(done);
-                } else {
-                    this.onDeckRequestArgs = [].slice.call(arguments, 0);
-                }
-                function done(resp) {
-                    var data = that.filter ? that.filter(resp) : resp;
-                    cb && cb(data);
-                    requestCache.set(url, resp);
-                }
-            },
-            _sendRequest: function(url) {
-                var that = this, jqXhr = pendingRequests[url];
-                if (!jqXhr) {
-                    incrementPendingRequests();
-                    jqXhr = pendingRequests[url] = $.ajax(url, this.ajaxSettings).always(always);
-                }
-                return jqXhr;
-                function always() {
-                    decrementPendingRequests();
-                    pendingRequests[url] = null;
-                    if (that.onDeckRequestArgs) {
-                        that._get.apply(that, that.onDeckRequestArgs);
-                        that.onDeckRequestArgs = null;
-                    }
-                }
-            },
-            get: function(query, cb) {
-                var that = this, encodedQuery = encodeURIComponent(query || ""), url, resp;
-                cb = cb || utils.noop;
-                url = this.replace ? this.replace(this.url, encodedQuery) : this.url.replace(this.wildcard, encodedQuery);
-                if (resp = requestCache.get(url)) {
-                    utils.defer(function() {
-                        cb(that.filter ? that.filter(resp) : resp);
-                    });
-                } else {
-                    this._get(url, cb);
-                }
-                return !!resp;
-            }
-        });
-        return Transport;
-        function incrementPendingRequests() {
-            pendingRequestsCount++;
-        }
-        function decrementPendingRequests() {
-            pendingRequestsCount--;
-        }
-        function belowPendingRequestsThreshold() {
-            return pendingRequestsCount < maxPendingRequests;
-        }
-    }();
-    var Dataset = function() {
-        var keys = {
-            thumbprint: "thumbprint",
-            protocol: "protocol",
-            itemHash: "itemHash",
-            adjacencyList: "adjacencyList"
-        };
-        function Dataset(o) {
-            utils.bindAll(this);
-            if (utils.isString(o.template) && !o.engine) {
-                $.error("no template engine specified");
-            }
-            if (!o.local && !o.prefetch && !o.remote) {
-                $.error("one of local, prefetch, or remote is required");
-            }
-            this.name = o.name || utils.getUniqueId();
-            this.limit = o.limit || 5;
-            this.minLength = o.minLength || 1;
-            this.header = o.header;
-            this.footer = o.footer;
-            this.valueKey = o.valueKey || "value";
-            this.template = compileTemplate(o.template, o.engine, this.valueKey);
-            this.local = o.local;
-            this.prefetch = o.prefetch;
-            this.remote = o.remote;
-            this.itemHash = {};
-            this.adjacencyList = {};
-            this.storage = o.name ? new PersistentStorage(o.name) : null;
-        }
-        utils.mixin(Dataset.prototype, {
-            _processLocalData: function(data) {
-                this._mergeProcessedData(this._processData(data));
-            },
-            _loadPrefetchData: function(o) {
-                var that = this, thumbprint = VERSION + (o.thumbprint || ""), storedThumbprint, storedProtocol, storedItemHash, storedAdjacencyList, isExpired, deferred;
-                if (this.storage) {
-                    storedThumbprint = this.storage.get(keys.thumbprint);
-                    storedProtocol = this.storage.get(keys.protocol);
-                    storedItemHash = this.storage.get(keys.itemHash);
-                    storedAdjacencyList = this.storage.get(keys.adjacencyList);
-                }
-                isExpired = storedThumbprint !== thumbprint || storedProtocol !== utils.getProtocol();
-                o = utils.isString(o) ? {
-                    url: o
-                } : o;
-                o.ttl = utils.isNumber(o.ttl) ? o.ttl : 24 * 60 * 60 * 1e3;
-                if (storedItemHash && storedAdjacencyList && !isExpired) {
-                    this._mergeProcessedData({
-                        itemHash: storedItemHash,
-                        adjacencyList: storedAdjacencyList
-                    });
-                    deferred = $.Deferred().resolve();
-                } else {
-                    deferred = $.getJSON(o.url).done(processPrefetchData);
-                }
-                return deferred;
-                function processPrefetchData(data) {
-                    var filteredData = o.filter ? o.filter(data) : data, processedData = that._processData(filteredData), itemHash = processedData.itemHash, adjacencyList = processedData.adjacencyList;
-                    if (that.storage) {
-                        that.storage.set(keys.itemHash, itemHash, o.ttl);
-                        that.storage.set(keys.adjacencyList, adjacencyList, o.ttl);
-                        that.storage.set(keys.thumbprint, thumbprint, o.ttl);
-                        that.storage.set(keys.protocol, utils.getProtocol(), o.ttl);
-                    }
-                    that._mergeProcessedData(processedData);
-                }
-            },
-            _transformDatum: function(datum) {
-                var value = utils.isString(datum) ? datum : datum[this.valueKey], tokens = datum.tokens || utils.tokenizeText(value), item = {
-                    value: value,
-                    tokens: tokens
-                };
-                if (utils.isString(datum)) {
-                    item.datum = {};
-                    item.datum[this.valueKey] = datum;
-                } else {
-                    item.datum = datum;
-                }
-                item.tokens = utils.filter(item.tokens, function(token) {
-                    return !utils.isBlankString(token);
-                });
-                item.tokens = utils.map(item.tokens, function(token) {
-                    return token.toLowerCase();
-                });
-                return item;
-            },
-            _processData: function(data) {
-                var that = this, itemHash = {}, adjacencyList = {};
-                utils.each(data, function(i, datum) {
-                    var item = that._transformDatum(datum), id = utils.getUniqueId(item.value);
-                    itemHash[id] = item;
-                    utils.each(item.tokens, function(i, token) {
-                        var character = token.charAt(0), adjacency = adjacencyList[character] || (adjacencyList[character] = [ id ]);
-                        !~utils.indexOf(adjacency, id) && adjacency.push(id);
-                    });
-                });
-                return {
-                    itemHash: itemHash,
-                    adjacencyList: adjacencyList
-                };
-            },
-            _mergeProcessedData: function(processedData) {
-                var that = this;
-                utils.mixin(this.itemHash, processedData.itemHash);
-                utils.each(processedData.adjacencyList, function(character, adjacency) {
-                    var masterAdjacency = that.adjacencyList[character];
-                    that.adjacencyList[character] = masterAdjacency ? masterAdjacency.concat(adjacency) : adjacency;
-                });
-            },
-            _getLocalSuggestions: function(terms) {
-                var that = this, firstChars = [], lists = [], shortestList, suggestions = [];
-                utils.each(terms, function(i, term) {
-                    var firstChar = term.charAt(0);
-                    !~utils.indexOf(firstChars, firstChar) && firstChars.push(firstChar);
-                });
-                utils.each(firstChars, function(i, firstChar) {
-                    var list = that.adjacencyList[firstChar];
-                    if (!list) {
-                        return false;
-                    }
-                    lists.push(list);
-                    if (!shortestList || list.length < shortestList.length) {
-                        shortestList = list;
-                    }
-                });
-                if (lists.length < firstChars.length) {
-                    return [];
-                }
-                utils.each(shortestList, function(i, id) {
-                    var item = that.itemHash[id], isCandidate, isMatch;
-                    isCandidate = utils.every(lists, function(list) {
-                        return ~utils.indexOf(list, id);
-                    });
-                    isMatch = isCandidate && utils.every(terms, function(term) {
-                        return utils.some(item.tokens, function(token) {
-                            return token.indexOf(term) === 0;
-                        });
-                    });
-                    isMatch && suggestions.push(item);
-                });
-                return suggestions;
-            },
-            initialize: function() {
-                var deferred;
-                this.local && this._processLocalData(this.local);
-                this.transport = this.remote ? new Transport(this.remote) : null;
-                deferred = this.prefetch ? this._loadPrefetchData(this.prefetch) : $.Deferred().resolve();
-                this.local = this.prefetch = this.remote = null;
-                this.initialize = function() {
-                    return deferred;
-                };
-                return deferred;
-            },
-            getSuggestions: function(query, cb) {
-                var that = this, terms, suggestions, cacheHit = false;
-                if (query.length < this.minLength) {
-                    return;
-                }
-                terms = utils.tokenizeQuery(query);
-                suggestions = this._getLocalSuggestions(terms).slice(0, this.limit);
-                if (suggestions.length < this.limit && this.transport) {
-                    cacheHit = this.transport.get(query, processRemoteData);
-                }
-                !cacheHit && cb && cb(suggestions);
-                function processRemoteData(data) {
-                    suggestions = suggestions.slice(0);
-                    utils.each(data, function(i, datum) {
-                        var item = that._transformDatum(datum), isDuplicate;
-                        isDuplicate = utils.some(suggestions, function(suggestion) {
-                            return item.value === suggestion.value;
-                        });
-                        !isDuplicate && suggestions.push(item);
-                        return suggestions.length < that.limit;
-                    });
-                    cb && cb(suggestions);
-                }
-            }
-        });
-        return Dataset;
-        function compileTemplate(template, engine, valueKey) {
-            var renderFn, compiledTemplate;
-            if (utils.isFunction(template)) {
-                renderFn = template;
-            } else if (utils.isString(template)) {
-                compiledTemplate = engine.compile(template);
-                renderFn = utils.bind(compiledTemplate.render, compiledTemplate);
-            } else {
-                renderFn = function(context) {
-                    return "<p>" + context[valueKey] + "</p>";
-                };
-            }
-            return renderFn;
-        }
-    }();
-    var InputView = function() {
-        function InputView(o) {
-            var that = this;
-            utils.bindAll(this);
-            this.specialKeyCodeMap = {
-                9: "tab",
-                27: "esc",
-                37: "left",
-                39: "right",
-                13: "enter",
-                38: "up",
-                40: "down"
-            };
-            this.$hint = $(o.hint);
-            this.$input = $(o.input).on("blur.tt", this._handleBlur).on("focus.tt", this._handleFocus).on("keydown.tt", this._handleSpecialKeyEvent);
-            if (!utils.isMsie()) {
-                this.$input.on("input.tt", this._compareQueryToInputValue);
-            } else {
-                this.$input.on("keydown.tt keypress.tt cut.tt paste.tt", function($e) {
-                    if (that.specialKeyCodeMap[$e.which || $e.keyCode]) {
-                        return;
-                    }
-                    utils.defer(that._compareQueryToInputValue);
-                });
-            }
-            this.query = this.$input.val();
-            this.$overflowHelper = buildOverflowHelper(this.$input);
-        }
-        utils.mixin(InputView.prototype, EventTarget, {
-            _handleFocus: function() {
-                this.trigger("focused");
-            },
-            _handleBlur: function() {
-                this.trigger("blured");
-            },
-            _handleSpecialKeyEvent: function($e) {
-                var keyName = this.specialKeyCodeMap[$e.which || $e.keyCode];
-                keyName && this.trigger(keyName + "Keyed", $e);
-            },
-            _compareQueryToInputValue: function() {
-                var inputValue = this.getInputValue(), isSameQuery = compareQueries(this.query, inputValue), isSameQueryExceptWhitespace = isSameQuery ? this.query.length !== inputValue.length : false;
-                if (isSameQueryExceptWhitespace) {
-                    this.trigger("whitespaceChanged", {
-                        value: this.query
-                    });
-                } else if (!isSameQuery) {
-                    this.trigger("queryChanged", {
-                        value: this.query = inputValue
-                    });
-                }
-            },
-            destroy: function() {
-                this.$hint.off(".tt");
-                this.$input.off(".tt");
-                this.$hint = this.$input = this.$overflowHelper = null;
-            },
-            focus: function() {
-                this.$input.focus();
-            },
-            blur: function() {
-                this.$input.blur();
-            },
-            getQuery: function() {
-                return this.query;
-            },
-            setQuery: function(query) {
-                this.query = query;
-            },
-            getInputValue: function() {
-                return this.$input.val();
-            },
-            setInputValue: function(value, silent) {
-                this.$input.val(value);
-                !silent && this._compareQueryToInputValue();
-            },
-            getHintValue: function() {
-                return this.$hint.val();
-            },
-            setHintValue: function(value) {
-                this.$hint.val(value);
-            },
-            getLanguageDirection: function() {
-                return (this.$input.css("direction") || "ltr").toLowerCase();
-            },
-            isOverflow: function() {
-                this.$overflowHelper.text(this.getInputValue());
-                return this.$overflowHelper.width() > this.$input.width();
-            },
-            isCursorAtEnd: function() {
-                var valueLength = this.$input.val().length, selectionStart = this.$input[0].selectionStart, range;
-                if (utils.isNumber(selectionStart)) {
-                    return selectionStart === valueLength;
-                } else if (document.selection) {
-                    range = document.selection.createRange();
-                    range.moveStart("character", -valueLength);
-                    return valueLength === range.text.length;
-                }
-                return true;
-            }
-        });
-        return InputView;
-        function buildOverflowHelper($input) {
-            return $("<span></span>").css({
-                position: "absolute",
-                left: "-9999px",
-                visibility: "hidden",
-                whiteSpace: "nowrap",
-                fontFamily: $input.css("font-family"),
-                fontSize: $input.css("font-size"),
-                fontStyle: $input.css("font-style"),
-                fontVariant: $input.css("font-variant"),
-                fontWeight: $input.css("font-weight"),
-                wordSpacing: $input.css("word-spacing"),
-                letterSpacing: $input.css("letter-spacing"),
-                textIndent: $input.css("text-indent"),
-                textRendering: $input.css("text-rendering"),
-                textTransform: $input.css("text-transform")
-            }).insertAfter($input);
-        }
-        function compareQueries(a, b) {
-            a = (a || "").replace(/^\s*/g, "").replace(/\s{2,}/g, " ");
-            b = (b || "").replace(/^\s*/g, "").replace(/\s{2,}/g, " ");
-            return a === b;
-        }
-    }();
-    var DropdownView = function() {
-        var html = {
-            suggestionsList: '<span class="tt-suggestions"></span>'
-        }, css = {
-            suggestionsList: {
-                display: "block"
-            },
-            suggestion: {
-                whiteSpace: "nowrap",
-                cursor: "pointer"
-            },
-            suggestionChild: {
-                whiteSpace: "normal"
-            }
-        };
-        function DropdownView(o) {
-            utils.bindAll(this);
-            this.isOpen = false;
-            this.isEmpty = true;
-            this.isMouseOverDropdown = false;
-            this.$menu = $(o.menu).on("mouseenter.tt", this._handleMouseenter).on("mouseleave.tt", this._handleMouseleave).on("click.tt", ".tt-suggestion", this._handleSelection).on("mouseover.tt", ".tt-suggestion", this._handleMouseover);
-        }
-        utils.mixin(DropdownView.prototype, EventTarget, {
-            _handleMouseenter: function() {
-                this.isMouseOverDropdown = true;
-            },
-            _handleMouseleave: function() {
-                this.isMouseOverDropdown = false;
-            },
-            _handleMouseover: function($e) {
-                var $suggestion = $($e.currentTarget);
-                this._getSuggestions().removeClass("tt-is-under-cursor");
-                $suggestion.addClass("tt-is-under-cursor");
-            },
-            _handleSelection: function($e) {
-                var $suggestion = $($e.currentTarget);
-                this.trigger("suggestionSelected", extractSuggestion($suggestion));
-            },
-            _show: function() {
-                this.$menu.css("display", "block");
-            },
-            _hide: function() {
-                this.$menu.hide();
-            },
-            _moveCursor: function(increment) {
-                var $suggestions, $cur, nextIndex, $underCursor;
-                if (!this.isVisible()) {
-                    return;
-                }
-                $suggestions = this._getSuggestions();
-                $cur = $suggestions.filter(".tt-is-under-cursor");
-                $cur.removeClass("tt-is-under-cursor");
-                nextIndex = $suggestions.index($cur) + increment;
-                nextIndex = (nextIndex + 1) % ($suggestions.length + 1) - 1;
-                if (nextIndex === -1) {
-                    this.trigger("cursorRemoved");
-                    return;
-                } else if (nextIndex < -1) {
-                    nextIndex = $suggestions.length - 1;
-                }
-                $underCursor = $suggestions.eq(nextIndex).addClass("tt-is-under-cursor");
-                this._ensureVisibility($underCursor);
-                this.trigger("cursorMoved", extractSuggestion($underCursor));
-            },
-            _getSuggestions: function() {
-                return this.$menu.find(".tt-suggestions > .tt-suggestion");
-            },
-            _ensureVisibility: function($el) {
-                var menuHeight = this.$menu.height() + parseInt(this.$menu.css("paddingTop"), 10) + parseInt(this.$menu.css("paddingBottom"), 10), menuScrollTop = this.$menu.scrollTop(), elTop = $el.position().top, elBottom = elTop + $el.outerHeight(true);
-                if (elTop < 0) {
-                    this.$menu.scrollTop(menuScrollTop + elTop);
-                } else if (menuHeight < elBottom) {
-                    this.$menu.scrollTop(menuScrollTop + (elBottom - menuHeight));
-                }
-            },
-            destroy: function() {
-                this.$menu.off(".tt");
-                this.$menu = null;
-            },
-            isVisible: function() {
-                return this.isOpen && !this.isEmpty;
-            },
-            closeUnlessMouseIsOverDropdown: function() {
-                if (!this.isMouseOverDropdown) {
-                    this.close();
-                }
-            },
-            close: function() {
-                if (this.isOpen) {
-                    this.isOpen = false;
-                    this.isMouseOverDropdown = false;
-                    this._hide();
-                    this.$menu.find(".tt-suggestions > .tt-suggestion").removeClass("tt-is-under-cursor");
-                    this.trigger("closed");
-                }
-            },
-            open: function() {
-                if (!this.isOpen) {
-                    this.isOpen = true;
-                    !this.isEmpty && this._show();
-                    this.trigger("opened");
-                }
-            },
-            setLanguageDirection: function(dir) {
-                var ltrCss = {
-                    left: "0",
-                    right: "auto"
-                }, rtlCss = {
-                    left: "auto",
-                    right: " 0"
-                };
-                dir === "ltr" ? this.$menu.css(ltrCss) : this.$menu.css(rtlCss);
-            },
-            moveCursorUp: function() {
-                this._moveCursor(-1);
-            },
-            moveCursorDown: function() {
-                this._moveCursor(+1);
-            },
-            getSuggestionUnderCursor: function() {
-                var $suggestion = this._getSuggestions().filter(".tt-is-under-cursor").first();
-                return $suggestion.length > 0 ? extractSuggestion($suggestion) : null;
-            },
-            getFirstSuggestion: function() {
-                var $suggestion = this._getSuggestions().first();
-                return $suggestion.length > 0 ? extractSuggestion($suggestion) : null;
-            },
-            renderSuggestions: function(dataset, suggestions) {
-                var datasetClassName = "tt-dataset-" + dataset.name, wrapper = '<div class="tt-suggestion">%body</div>', compiledHtml, $suggestionsList, $dataset = this.$menu.find("." + datasetClassName), elBuilder, fragment, $el;
-                if ($dataset.length === 0) {
-                    $suggestionsList = $(html.suggestionsList).css(css.suggestionsList);
-                    $dataset = $("<div></div>").addClass(datasetClassName).append(dataset.header).append($suggestionsList).append(dataset.footer).appendTo(this.$menu);
-                }
-                if (suggestions.length > 0) {
-                    this.isEmpty = false;
-                    this.isOpen && this._show();
-                    elBuilder = document.createElement("div");
-                    fragment = document.createDocumentFragment();
-                    utils.each(suggestions, function(i, suggestion) {
-                        suggestion.dataset = dataset.name;
-                        compiledHtml = dataset.template(suggestion.datum);
-                        elBuilder.innerHTML = wrapper.replace("%body", compiledHtml);
-                        $el = $(elBuilder.firstChild).css(css.suggestion).data("suggestion", suggestion);
-                        $el.children().each(function() {
-                            $(this).css(css.suggestionChild);
-                        });
-                        fragment.appendChild($el[0]);
-                    });
-                    $dataset.show().find(".tt-suggestions").html(fragment);
-                } else {
-                    this.clearSuggestions(dataset.name);
-                }
-                this.trigger("suggestionsRendered");
-            },
-            clearSuggestions: function(datasetName) {
-                var $datasets = datasetName ? this.$menu.find(".tt-dataset-" + datasetName) : this.$menu.find('[class^="tt-dataset-"]'), $suggestions = $datasets.find(".tt-suggestions");
-                $datasets.hide();
-                $suggestions.empty();
-                if (this._getSuggestions().length === 0) {
-                    this.isEmpty = true;
-                    this._hide();
-                }
-            }
-        });
-        return DropdownView;
-        function extractSuggestion($el) {
-            return $el.data("suggestion");
-        }
-    }();
-    var TypeaheadView = function() {
-        var html = {
-            wrapper: '<span class="twitter-typeahead"></span>',
-            hint: '<input class="tt-hint" type="text" autocomplete="off" spellcheck="off" disabled>',
-            dropdown: '<span class="tt-dropdown-menu"></span>'
-        }, css = {
-            wrapper: {
-                position: "relative",
-                display: "inline-block"
-            },
-            hint: {
-                position: "absolute",
-                top: "0",
-                left: "0",
-                borderColor: "transparent",
-                boxShadow: "none"
-            },
-            query: {
-                position: "relative",
-                verticalAlign: "top",
-                backgroundColor: "transparent"
-            },
-            dropdown: {
-                position: "absolute",
-                top: "100%",
-                left: "0",
-                zIndex: "100",
-                display: "none"
-            }
-        };
-        if (utils.isMsie()) {
-            utils.mixin(css.query, {
-                backgroundImage: "url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)"
-            });
-        }
-        if (utils.isMsie() && utils.isMsie() <= 7) {
-            utils.mixin(css.wrapper, {
-                display: "inline",
-                zoom: "1"
-            });
-            utils.mixin(css.query, {
-                marginTop: "-1px"
-            });
-        }
-        function TypeaheadView(o) {
-            var $menu, $input, $hint;
-            utils.bindAll(this);
-            this.$node = buildDomStructure(o.input);
-            this.datasets = o.datasets;
-            this.dir = null;
-            this.eventBus = o.eventBus;
-            $menu = this.$node.find(".tt-dropdown-menu");
-            $input = this.$node.find(".tt-query");
-            $hint = this.$node.find(".tt-hint");
-            this.dropdownView = new DropdownView({
-                menu: $menu
-            }).on("suggestionSelected", this._handleSelection).on("cursorMoved", this._clearHint).on("cursorMoved", this._setInputValueToSuggestionUnderCursor).on("cursorRemoved", this._setInputValueToQuery).on("cursorRemoved", this._updateHint).on("suggestionsRendered", this._updateHint).on("opened", this._updateHint).on("closed", this._clearHint).on("opened closed", this._propagateEvent);
-            this.inputView = new InputView({
-                input: $input,
-                hint: $hint
-            }).on("focused", this._openDropdown).on("blured", this._closeDropdown).on("blured", this._setInputValueToQuery).on("enterKeyed tabKeyed", this._handleSelection).on("queryChanged", this._clearHint).on("queryChanged", this._clearSuggestions).on("queryChanged", this._getSuggestions).on("whitespaceChanged", this._updateHint).on("queryChanged whitespaceChanged", this._openDropdown).on("queryChanged whitespaceChanged", this._setLanguageDirection).on("escKeyed", this._closeDropdown).on("escKeyed", this._setInputValueToQuery).on("tabKeyed upKeyed downKeyed", this._managePreventDefault).on("upKeyed downKeyed", this._moveDropdownCursor).on("upKeyed downKeyed", this._openDropdown).on("tabKeyed leftKeyed rightKeyed", this._autocomplete);
-        }
-        utils.mixin(TypeaheadView.prototype, EventTarget, {
-            _managePreventDefault: function(e) {
-                var $e = e.data, hint, inputValue, preventDefault = false;
-                switch (e.type) {
-                  case "tabKeyed":
-                    hint = this.inputView.getHintValue();
-                    inputValue = this.inputView.getInputValue();
-                    preventDefault = hint && hint !== inputValue;
-                    break;
-
-                  case "upKeyed":
-                  case "downKeyed":
-                    preventDefault = !$e.shiftKey && !$e.ctrlKey && !$e.metaKey;
-                    break;
-                }
-                preventDefault && $e.preventDefault();
-            },
-            _setLanguageDirection: function() {
-                var dir = this.inputView.getLanguageDirection();
-                if (dir !== this.dir) {
-                    this.dir = dir;
-                    this.$node.css("direction", dir);
-                    this.dropdownView.setLanguageDirection(dir);
-                }
-            },
-            _updateHint: function() {
-                var suggestion = this.dropdownView.getFirstSuggestion(), hint = suggestion ? suggestion.value : null, dropdownIsVisible = this.dropdownView.isVisible(), inputHasOverflow = this.inputView.isOverflow(), inputValue, query, escapedQuery, beginsWithQuery, match;
-                if (hint && dropdownIsVisible && !inputHasOverflow) {
-                    inputValue = this.inputView.getInputValue();
-                    query = inputValue.replace(/\s{2,}/g, " ").replace(/^\s+/g, "");
-                    escapedQuery = utils.escapeRegExChars(query);
-                    beginsWithQuery = new RegExp("^(?:" + escapedQuery + ")(.*$)", "i");
-                    match = beginsWithQuery.exec(hint);
-                    this.inputView.setHintValue(inputValue + (match ? match[1] : ""));
-                }
-            },
-            _clearHint: function() {
-                this.inputView.setHintValue("");
-            },
-            _clearSuggestions: function() {
-                this.dropdownView.clearSuggestions();
-            },
-            _setInputValueToQuery: function() {
-                this.inputView.setInputValue(this.inputView.getQuery());
-            },
-            _setInputValueToSuggestionUnderCursor: function(e) {
-                var suggestion = e.data;
-                this.inputView.setInputValue(suggestion.value, true);
-            },
-            _openDropdown: function() {
-                this.dropdownView.open();
-            },
-            _closeDropdown: function(e) {
-                this.dropdownView[e.type === "blured" ? "closeUnlessMouseIsOverDropdown" : "close"]();
-            },
-            _moveDropdownCursor: function(e) {
-                var $e = e.data;
-                if (!$e.shiftKey && !$e.ctrlKey && !$e.metaKey) {
-                    this.dropdownView[e.type === "upKeyed" ? "moveCursorUp" : "moveCursorDown"]();
-                }
-            },
-            _handleSelection: function(e) {
-                var byClick = e.type === "suggestionSelected", suggestion = byClick ? e.data : this.dropdownView.getSuggestionUnderCursor();
-                if (suggestion) {
-                    this.inputView.setInputValue(suggestion.value);
-                    byClick ? this.inputView.focus() : e.data.preventDefault();
-                    byClick && utils.isMsie() ? utils.defer(this.dropdownView.close) : this.dropdownView.close();
-                    this.eventBus.trigger("selected", suggestion.datum, suggestion.dataset);
-                }
-            },
-            _getSuggestions: function() {
-                var that = this, query = this.inputView.getQuery();
-                if (utils.isBlankString(query)) {
-                    return;
-                }
-                utils.each(this.datasets, function(i, dataset) {
-                    dataset.getSuggestions(query, function(suggestions) {
-                        if (query === that.inputView.getQuery()) {
-                            that.dropdownView.renderSuggestions(dataset, suggestions);
-                        }
-                    });
-                });
-            },
-            _autocomplete: function(e) {
-                var isCursorAtEnd, ignoreEvent, query, hint, suggestion;
-                if (e.type === "rightKeyed" || e.type === "leftKeyed") {
-                    isCursorAtEnd = this.inputView.isCursorAtEnd();
-                    ignoreEvent = this.inputView.getLanguageDirection() === "ltr" ? e.type === "leftKeyed" : e.type === "rightKeyed";
-                    if (!isCursorAtEnd || ignoreEvent) {
-                        return;
-                    }
-                }
-                query = this.inputView.getQuery();
-                hint = this.inputView.getHintValue();
-                if (hint !== "" && query !== hint) {
-                    suggestion = this.dropdownView.getFirstSuggestion();
-                    this.inputView.setInputValue(suggestion.value);
-                    this.eventBus.trigger("autocompleted", suggestion.datum, suggestion.dataset);
-                }
-            },
-            _propagateEvent: function(e) {
-                this.eventBus.trigger(e.type);
-            },
-            destroy: function() {
-                this.inputView.destroy();
-                this.dropdownView.destroy();
-                destroyDomStructure(this.$node);
-                this.$node = null;
-            },
-            setQuery: function(query) {
-                this.inputView.setQuery(query);
-                this.inputView.setInputValue(query);
-                this._clearHint();
-                this._clearSuggestions();
-                this._getSuggestions();
-            }
-        });
-        return TypeaheadView;
-        function buildDomStructure(input) {
-            var $wrapper = $(html.wrapper), $dropdown = $(html.dropdown), $input = $(input), $hint = $(html.hint);
-            $wrapper = $wrapper.css(css.wrapper);
-            $dropdown = $dropdown.css(css.dropdown);
-            $hint.css(css.hint).css({
-                backgroundAttachment: $input.css("background-attachment"),
-                backgroundClip: $input.css("background-clip"),
-                backgroundColor: $input.css("background-color"),
-                backgroundImage: $input.css("background-image"),
-                backgroundOrigin: $input.css("background-origin"),
-                backgroundPosition: $input.css("background-position"),
-                backgroundRepeat: $input.css("background-repeat"),
-                backgroundSize: $input.css("background-size")
-            });
-            $input.data("ttAttrs", {
-                dir: $input.attr("dir"),
-                autocomplete: $input.attr("autocomplete"),
-                spellcheck: $input.attr("spellcheck"),
-                style: $input.attr("style")
-            });
-            $input.addClass("tt-query").attr({
-                autocomplete: "off",
-                spellcheck: false
-            }).css(css.query);
-            try {
-                !$input.attr("dir") && $input.attr("dir", "auto");
-            } catch (e) {}
-            return $input.wrap($wrapper).parent().prepend($hint).append($dropdown);
-        }
-        function destroyDomStructure($node) {
-            var $input = $node.find(".tt-query");
-            utils.each($input.data("ttAttrs"), function(key, val) {
-                utils.isUndefined(val) ? $input.removeAttr(key) : $input.attr(key, val);
-            });
-            $input.detach().removeData("ttAttrs").removeClass("tt-query").insertAfter($node);
-            $node.remove();
-        }
-    }();
-    (function() {
-        var cache = {}, viewKey = "ttView", methods;
-        methods = {
-            initialize: function(datasetDefs) {
-                var datasets;
-                datasetDefs = utils.isArray(datasetDefs) ? datasetDefs : [ datasetDefs ];
-                if (datasetDefs.length === 0) {
-                    $.error("no datasets provided");
-                }
-                datasets = utils.map(datasetDefs, function(o) {
-                    var dataset = cache[o.name] ? cache[o.name] : new Dataset(o);
-                    if (o.name) {
-                        cache[o.name] = dataset;
-                    }
-                    return dataset;
-                });
-                return this.each(initialize);
-                function initialize() {
-                    var $input = $(this), deferreds, eventBus = new EventBus({
-                        el: $input
-                    });
-                    deferreds = utils.map(datasets, function(dataset) {
-                        return dataset.initialize();
-                    });
-                    $input.data(viewKey, new TypeaheadView({
-                        input: $input,
-                        eventBus: eventBus = new EventBus({
-                            el: $input
-                        }),
-                        datasets: datasets
-                    }));
-                    $.when.apply($, deferreds).always(function() {
-                        utils.defer(function() {
-                            eventBus.trigger("initialized");
-                        });
-                    });
-                }
-            },
-            destroy: function() {
-                return this.each(destroy);
-                function destroy() {
-                    var $this = $(this), view = $this.data(viewKey);
-                    if (view) {
-                        view.destroy();
-                        $this.removeData(viewKey);
-                    }
-                }
-            },
-            setQuery: function(query) {
-                return this.each(setQuery);
-                function setQuery() {
-                    var view = $(this).data(viewKey);
-                    view && view.setQuery(query);
-                }
-            }
-        };
-        jQuery.fn.typeahead = function(method) {
-            if (methods[method]) {
-                return methods[method].apply(this, [].slice.call(arguments, 1));
-            } else {
-                return methods.initialize.apply(this, arguments);
-            }
-        };
-    })();
-})(window.jQuery);
\ No newline at end of file
diff --git a/dist/typeahead.min.js b/dist/typeahead.min.js
deleted file mode 100644
index c085f8a8..00000000
--- a/dist/typeahead.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
- * typeahead.js 0.9.3
- * https://github.com/twitter/typeahead
- * Copyright 2013 Twitter, Inc. and other contributors; Licensed MIT
- */
-
-!function(a){var b="0.9.3",c={isMsie:function(){var a=/(msie) ([\w.]+)/i.exec(navigator.userAgent);return a?parseInt(a[2],10):!1},isBlankString:function(a){return!a||/^\s*$/.test(a)},escapeRegExChars:function(a){return a.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&")},isString:function(a){return"string"==typeof a},isNumber:function(a){return"number"==typeof a},isArray:a.isArray,isFunction:a.isFunction,isObject:a.isPlainObject,isUndefined:function(a){return"undefined"==typeof a},bind:a.proxy,bindAll:function(b){var c;for(var d in b)a.isFunction(c=b[d])&&(b[d]=a.proxy(c,b))},indexOf:function(a,b){for(var c=0;c<a.length;c++)if(a[c]===b)return c;return-1},each:a.each,map:a.map,filter:a.grep,every:function(b,c){var d=!0;return b?(a.each(b,function(a,e){return(d=c.call(null,e,a,b))?void 0:!1}),!!d):d},some:function(b,c){var d=!1;return b?(a.each(b,function(a,e){return(d=c.call(null,e,a,b))?!1:void 0}),!!d):d},mixin:a.extend,getUniqueId:function(){var a=0;return function(){return a++}}(),defer:function(a){setTimeout(a,0)},debounce:function(a,b,c){var d,e;return function(){var f,g,h=this,i=arguments;return f=function(){d=null,c||(e=a.apply(h,i))},g=c&&!d,clearTimeout(d),d=setTimeout(f,b),g&&(e=a.apply(h,i)),e}},throttle:function(a,b){var c,d,e,f,g,h;return g=0,h=function(){g=new Date,e=null,f=a.apply(c,d)},function(){var i=new Date,j=b-(i-g);return c=this,d=arguments,0>=j?(clearTimeout(e),e=null,g=i,f=a.apply(c,d)):e||(e=setTimeout(h,j)),f}},tokenizeQuery:function(b){return a.trim(b).toLowerCase().split(/[\s]+/)},tokenizeText:function(b){return a.trim(b).toLowerCase().split(/[\s\-_]+/)},getProtocol:function(){return location.protocol},noop:function(){}},d=function(){var a=/\s+/;return{on:function(b,c){var d;if(!c)return this;for(this._callbacks=this._callbacks||{},b=b.split(a);d=b.shift();)this._callbacks[d]=this._callbacks[d]||[],this._callbacks[d].push(c);return this},trigger:function(b,c){var d,e;if(!this._callbacks)return this;for(b=b.split(a);d=b.shift();)if(e=this._callbacks[d])for(var f=0;f<e.length;f+=1)e[f].call(this,{type:d,data:c});return this}}}(),e=function(){function b(b){b&&b.el||a.error("EventBus initialized without el"),this.$el=a(b.el)}var d="typeahead:";return c.mixin(b.prototype,{trigger:function(a){var b=[].slice.call(arguments,1);this.$el.trigger(d+a,b)}}),b}(),f=function(){function a(a){this.prefix=["__",a,"__"].join(""),this.ttlKey="__ttl__",this.keyMatcher=new RegExp("^"+this.prefix)}function b(){return(new Date).getTime()}function d(a){return JSON.stringify(c.isUndefined(a)?null:a)}function e(a){return JSON.parse(a)}var f,g;try{f=window.localStorage,f.setItem("~~~","!"),f.removeItem("~~~")}catch(h){f=null}return g=f&&window.JSON?{_prefix:function(a){return this.prefix+a},_ttlKey:function(a){return this._prefix(a)+this.ttlKey},get:function(a){return this.isExpired(a)&&this.remove(a),e(f.getItem(this._prefix(a)))},set:function(a,e,g){return c.isNumber(g)?f.setItem(this._ttlKey(a),d(b()+g)):f.removeItem(this._ttlKey(a)),f.setItem(this._prefix(a),d(e))},remove:function(a){return f.removeItem(this._ttlKey(a)),f.removeItem(this._prefix(a)),this},clear:function(){var a,b,c=[],d=f.length;for(a=0;d>a;a++)(b=f.key(a)).match(this.keyMatcher)&&c.push(b.replace(this.keyMatcher,""));for(a=c.length;a--;)this.remove(c[a]);return this},isExpired:function(a){var d=e(f.getItem(this._ttlKey(a)));return c.isNumber(d)&&b()>d?!0:!1}}:{get:c.noop,set:c.noop,remove:c.noop,clear:c.noop,isExpired:c.noop},c.mixin(a.prototype,g),a}(),g=function(){function a(a){c.bindAll(this),a=a||{},this.sizeLimit=a.sizeLimit||10,this.cache={},this.cachedKeysByAge=[]}return c.mixin(a.prototype,{get:function(a){return this.cache[a]},set:function(a,b){var c;this.cachedKeysByAge.length===this.sizeLimit&&(c=this.cachedKeysByAge.shift(),delete this.cache[c]),this.cache[a]=b,this.cachedKeysByAge.push(a)}}),a}(),h=function(){function b(a){c.bindAll(this),a=c.isString(a)?{url:a}:a,i=i||new g,h=c.isNumber(a.maxParallelRequests)?a.maxParallelRequests:h||6,this.url=a.url,this.wildcard=a.wildcard||"%QUERY",this.filter=a.filter,this.replace=a.replace,this.ajaxSettings={type:"get",cache:a.cache,timeout:a.timeout,dataType:a.dataType||"json",beforeSend:a.beforeSend},this._get=(/^throttle$/i.test(a.rateLimitFn)?c.throttle:c.debounce)(this._get,a.rateLimitWait||300)}function d(){j++}function e(){j--}function f(){return h>j}var h,i,j=0,k={};return c.mixin(b.prototype,{_get:function(a,b){function c(c){var e=d.filter?d.filter(c):c;b&&b(e),i.set(a,c)}var d=this;f()?this._sendRequest(a).done(c):this.onDeckRequestArgs=[].slice.call(arguments,0)},_sendRequest:function(b){function c(){e(),k[b]=null,f.onDeckRequestArgs&&(f._get.apply(f,f.onDeckRequestArgs),f.onDeckRequestArgs=null)}var f=this,g=k[b];return g||(d(),g=k[b]=a.ajax(b,this.ajaxSettings).always(c)),g},get:function(a,b){var d,e,f=this,g=encodeURIComponent(a||"");return b=b||c.noop,d=this.replace?this.replace(this.url,g):this.url.replace(this.wildcard,g),(e=i.get(d))?c.defer(function(){b(f.filter?f.filter(e):e)}):this._get(d,b),!!e}}),b}(),i=function(){function d(b){c.bindAll(this),c.isString(b.template)&&!b.engine&&a.error("no template engine specified"),b.local||b.prefetch||b.remote||a.error("one of local, prefetch, or remote is required"),this.name=b.name||c.getUniqueId(),this.limit=b.limit||5,this.minLength=b.minLength||1,this.header=b.header,this.footer=b.footer,this.valueKey=b.valueKey||"value",this.template=e(b.template,b.engine,this.valueKey),this.local=b.local,this.prefetch=b.prefetch,this.remote=b.remote,this.itemHash={},this.adjacencyList={},this.storage=b.name?new f(b.name):null}function e(a,b,d){var e,f;return c.isFunction(a)?e=a:c.isString(a)?(f=b.compile(a),e=c.bind(f.render,f)):e=function(a){return"<p>"+a[d]+"</p>"},e}var g={thumbprint:"thumbprint",protocol:"protocol",itemHash:"itemHash",adjacencyList:"adjacencyList"};return c.mixin(d.prototype,{_processLocalData:function(a){this._mergeProcessedData(this._processData(a))},_loadPrefetchData:function(d){function e(a){var b=d.filter?d.filter(a):a,e=m._processData(b),f=e.itemHash,h=e.adjacencyList;m.storage&&(m.storage.set(g.itemHash,f,d.ttl),m.storage.set(g.adjacencyList,h,d.ttl),m.storage.set(g.thumbprint,n,d.ttl),m.storage.set(g.protocol,c.getProtocol(),d.ttl)),m._mergeProcessedData(e)}var f,h,i,j,k,l,m=this,n=b+(d.thumbprint||"");return this.storage&&(f=this.storage.get(g.thumbprint),h=this.storage.get(g.protocol),i=this.storage.get(g.itemHash),j=this.storage.get(g.adjacencyList)),k=f!==n||h!==c.getProtocol(),d=c.isString(d)?{url:d}:d,d.ttl=c.isNumber(d.ttl)?d.ttl:864e5,i&&j&&!k?(this._mergeProcessedData({itemHash:i,adjacencyList:j}),l=a.Deferred().resolve()):l=a.getJSON(d.url).done(e),l},_transformDatum:function(a){var b=c.isString(a)?a:a[this.valueKey],d=a.tokens||c.tokenizeText(b),e={value:b,tokens:d};return c.isString(a)?(e.datum={},e.datum[this.valueKey]=a):e.datum=a,e.tokens=c.filter(e.tokens,function(a){return!c.isBlankString(a)}),e.tokens=c.map(e.tokens,function(a){return a.toLowerCase()}),e},_processData:function(a){var b=this,d={},e={};return c.each(a,function(a,f){var g=b._transformDatum(f),h=c.getUniqueId(g.value);d[h]=g,c.each(g.tokens,function(a,b){var d=b.charAt(0),f=e[d]||(e[d]=[h]);!~c.indexOf(f,h)&&f.push(h)})}),{itemHash:d,adjacencyList:e}},_mergeProcessedData:function(a){var b=this;c.mixin(this.itemHash,a.itemHash),c.each(a.adjacencyList,function(a,c){var d=b.adjacencyList[a];b.adjacencyList[a]=d?d.concat(c):c})},_getLocalSuggestions:function(a){var b,d=this,e=[],f=[],g=[];return c.each(a,function(a,b){var d=b.charAt(0);!~c.indexOf(e,d)&&e.push(d)}),c.each(e,function(a,c){var e=d.adjacencyList[c];return e?(f.push(e),(!b||e.length<b.length)&&(b=e),void 0):!1}),f.length<e.length?[]:(c.each(b,function(b,e){var h,i,j=d.itemHash[e];h=c.every(f,function(a){return~c.indexOf(a,e)}),i=h&&c.every(a,function(a){return c.some(j.tokens,function(b){return 0===b.indexOf(a)})}),i&&g.push(j)}),g)},initialize:function(){var b;return this.local&&this._processLocalData(this.local),this.transport=this.remote?new h(this.remote):null,b=this.prefetch?this._loadPrefetchData(this.prefetch):a.Deferred().resolve(),this.local=this.prefetch=this.remote=null,this.initialize=function(){return b},b},getSuggestions:function(a,b){function d(a){f=f.slice(0),c.each(a,function(a,b){var d,e=g._transformDatum(b);return d=c.some(f,function(a){return e.value===a.value}),!d&&f.push(e),f.length<g.limit}),b&&b(f)}var e,f,g=this,h=!1;a.length<this.minLength||(e=c.tokenizeQuery(a),f=this._getLocalSuggestions(e).slice(0,this.limit),f.length<this.limit&&this.transport&&(h=this.transport.get(a,d)),!h&&b&&b(f))}}),d}(),j=function(){function b(b){var d=this;c.bindAll(this),this.specialKeyCodeMap={9:"tab",27:"esc",37:"left",39:"right",13:"enter",38:"up",40:"down"},this.$hint=a(b.hint),this.$input=a(b.input).on("blur.tt",this._handleBlur).on("focus.tt",this._handleFocus).on("keydown.tt",this._handleSpecialKeyEvent),c.isMsie()?this.$input.on("keydown.tt keypress.tt cut.tt paste.tt",function(a){d.specialKeyCodeMap[a.which||a.keyCode]||c.defer(d._compareQueryToInputValue)}):this.$input.on("input.tt",this._compareQueryToInputValue),this.query=this.$input.val(),this.$overflowHelper=e(this.$input)}function e(b){return a("<span></span>").css({position:"absolute",left:"-9999px",visibility:"hidden",whiteSpace:"nowrap",fontFamily:b.css("font-family"),fontSize:b.css("font-size"),fontStyle:b.css("font-style"),fontVariant:b.css("font-variant"),fontWeight:b.css("font-weight"),wordSpacing:b.css("word-spacing"),letterSpacing:b.css("letter-spacing"),textIndent:b.css("text-indent"),textRendering:b.css("text-rendering"),textTransform:b.css("text-transform")}).insertAfter(b)}function f(a,b){return a=(a||"").replace(/^\s*/g,"").replace(/\s{2,}/g," "),b=(b||"").replace(/^\s*/g,"").replace(/\s{2,}/g," "),a===b}return c.mixin(b.prototype,d,{_handleFocus:function(){this.trigger("focused")},_handleBlur:function(){this.trigger("blured")},_handleSpecialKeyEvent:function(a){var b=this.specialKeyCodeMap[a.which||a.keyCode];b&&this.trigger(b+"Keyed",a)},_compareQueryToInputValue:function(){var a=this.getInputValue(),b=f(this.query,a),c=b?this.query.length!==a.length:!1;c?this.trigger("whitespaceChanged",{value:this.query}):b||this.trigger("queryChanged",{value:this.query=a})},destroy:function(){this.$hint.off(".tt"),this.$input.off(".tt"),this.$hint=this.$input=this.$overflowHelper=null},focus:function(){this.$input.focus()},blur:function(){this.$input.blur()},getQuery:function(){return this.query},setQuery:function(a){this.query=a},getInputValue:function(){return this.$input.val()},setInputValue:function(a,b){this.$input.val(a),!b&&this._compareQueryToInputValue()},getHintValue:function(){return this.$hint.val()},setHintValue:function(a){this.$hint.val(a)},getLanguageDirection:function(){return(this.$input.css("direction")||"ltr").toLowerCase()},isOverflow:function(){return this.$overflowHelper.text(this.getInputValue()),this.$overflowHelper.width()>this.$input.width()},isCursorAtEnd:function(){var a,b=this.$input.val().length,d=this.$input[0].selectionStart;return c.isNumber(d)?d===b:document.selection?(a=document.selection.createRange(),a.moveStart("character",-b),b===a.text.length):!0}}),b}(),k=function(){function b(b){c.bindAll(this),this.isOpen=!1,this.isEmpty=!0,this.isMouseOverDropdown=!1,this.$menu=a(b.menu).on("mouseenter.tt",this._handleMouseenter).on("mouseleave.tt",this._handleMouseleave).on("click.tt",".tt-suggestion",this._handleSelection).on("mouseover.tt",".tt-suggestion",this._handleMouseover)}function e(a){return a.data("suggestion")}var f={suggestionsList:'<span class="tt-suggestions"></span>'},g={suggestionsList:{display:"block"},suggestion:{whiteSpace:"nowrap",cursor:"pointer"},suggestionChild:{whiteSpace:"normal"}};return c.mixin(b.prototype,d,{_handleMouseenter:function(){this.isMouseOverDropdown=!0},_handleMouseleave:function(){this.isMouseOverDropdown=!1},_handleMouseover:function(b){var c=a(b.currentTarget);this._getSuggestions().removeClass("tt-is-under-cursor"),c.addClass("tt-is-under-cursor")},_handleSelection:function(b){var c=a(b.currentTarget);this.trigger("suggestionSelected",e(c))},_show:function(){this.$menu.css("display","block")},_hide:function(){this.$menu.hide()},_moveCursor:function(a){var b,c,d,f;if(this.isVisible()){if(b=this._getSuggestions(),c=b.filter(".tt-is-under-cursor"),c.removeClass("tt-is-under-cursor"),d=b.index(c)+a,d=(d+1)%(b.length+1)-1,-1===d)return this.trigger("cursorRemoved"),void 0;-1>d&&(d=b.length-1),f=b.eq(d).addClass("tt-is-under-cursor"),this._ensureVisibility(f),this.trigger("cursorMoved",e(f))}},_getSuggestions:function(){return this.$menu.find(".tt-suggestions > .tt-suggestion")},_ensureVisibility:function(a){var b=this.$menu.height()+parseInt(this.$menu.css("paddingTop"),10)+parseInt(this.$menu.css("paddingBottom"),10),c=this.$menu.scrollTop(),d=a.position().top,e=d+a.outerHeight(!0);0>d?this.$menu.scrollTop(c+d):e>b&&this.$menu.scrollTop(c+(e-b))},destroy:function(){this.$menu.off(".tt"),this.$menu=null},isVisible:function(){return this.isOpen&&!this.isEmpty},closeUnlessMouseIsOverDropdown:function(){this.isMouseOverDropdown||this.close()},close:function(){this.isOpen&&(this.isOpen=!1,this.isMouseOverDropdown=!1,this._hide(),this.$menu.find(".tt-suggestions > .tt-suggestion").removeClass("tt-is-under-cursor"),this.trigger("closed"))},open:function(){this.isOpen||(this.isOpen=!0,!this.isEmpty&&this._show(),this.trigger("opened"))},setLanguageDirection:function(a){var b={left:"0",right:"auto"},c={left:"auto",right:" 0"};"ltr"===a?this.$menu.css(b):this.$menu.css(c)},moveCursorUp:function(){this._moveCursor(-1)},moveCursorDown:function(){this._moveCursor(1)},getSuggestionUnderCursor:function(){var a=this._getSuggestions().filter(".tt-is-under-cursor").first();return a.length>0?e(a):null},getFirstSuggestion:function(){var a=this._getSuggestions().first();return a.length>0?e(a):null},renderSuggestions:function(b,d){var e,h,i,j,k,l="tt-dataset-"+b.name,m='<div class="tt-suggestion">%body</div>',n=this.$menu.find("."+l);0===n.length&&(h=a(f.suggestionsList).css(g.suggestionsList),n=a("<div></div>").addClass(l).append(b.header).append(h).append(b.footer).appendTo(this.$menu)),d.length>0?(this.isEmpty=!1,this.isOpen&&this._show(),i=document.createElement("div"),j=document.createDocumentFragment(),c.each(d,function(c,d){d.dataset=b.name,e=b.template(d.datum),i.innerHTML=m.replace("%body",e),k=a(i.firstChild).css(g.suggestion).data("suggestion",d),k.children().each(function(){a(this).css(g.suggestionChild)}),j.appendChild(k[0])}),n.show().find(".tt-suggestions").html(j)):this.clearSuggestions(b.name),this.trigger("suggestionsRendered")},clearSuggestions:function(a){var b=a?this.$menu.find(".tt-dataset-"+a):this.$menu.find('[class^="tt-dataset-"]'),c=b.find(".tt-suggestions");b.hide(),c.empty(),0===this._getSuggestions().length&&(this.isEmpty=!0,this._hide())}}),b}(),l=function(){function b(a){var b,d,f;c.bindAll(this),this.$node=e(a.input),this.datasets=a.datasets,this.dir=null,this.eventBus=a.eventBus,b=this.$node.find(".tt-dropdown-menu"),d=this.$node.find(".tt-query"),f=this.$node.find(".tt-hint"),this.dropdownView=new k({menu:b}).on("suggestionSelected",this._handleSelection).on("cursorMoved",this._clearHint).on("cursorMoved",this._setInputValueToSuggestionUnderCursor).on("cursorRemoved",this._setInputValueToQuery).on("cursorRemoved",this._updateHint).on("suggestionsRendered",this._updateHint).on("opened",this._updateHint).on("closed",this._clearHint).on("opened closed",this._propagateEvent),this.inputView=new j({input:d,hint:f}).on("focused",this._openDropdown).on("blured",this._closeDropdown).on("blured",this._setInputValueToQuery).on("enterKeyed tabKeyed",this._handleSelection).on("queryChanged",this._clearHint).on("queryChanged",this._clearSuggestions).on("queryChanged",this._getSuggestions).on("whitespaceChanged",this._updateHint).on("queryChanged whitespaceChanged",this._openDropdown).on("queryChanged whitespaceChanged",this._setLanguageDirection).on("escKeyed",this._closeDropdown).on("escKeyed",this._setInputValueToQuery).on("tabKeyed upKeyed downKeyed",this._managePreventDefault).on("upKeyed downKeyed",this._moveDropdownCursor).on("upKeyed downKeyed",this._openDropdown).on("tabKeyed leftKeyed rightKeyed",this._autocomplete)}function e(b){var c=a(g.wrapper),d=a(g.dropdown),e=a(b),f=a(g.hint);c=c.css(h.wrapper),d=d.css(h.dropdown),f.css(h.hint).css({backgroundAttachment:e.css("background-attachment"),backgroundClip:e.css("background-clip"),backgroundColor:e.css("background-color"),backgroundImage:e.css("background-image"),backgroundOrigin:e.css("background-origin"),backgroundPosition:e.css("background-position"),backgroundRepeat:e.css("background-repeat"),backgroundSize:e.css("background-size")}),e.data("ttAttrs",{dir:e.attr("dir"),autocomplete:e.attr("autocomplete"),spellcheck:e.attr("spellcheck"),style:e.attr("style")}),e.addClass("tt-query").attr({autocomplete:"off",spellcheck:!1}).css(h.query);try{!e.attr("dir")&&e.attr("dir","auto")}catch(i){}return e.wrap(c).parent().prepend(f).append(d)}function f(a){var b=a.find(".tt-query");c.each(b.data("ttAttrs"),function(a,d){c.isUndefined(d)?b.removeAttr(a):b.attr(a,d)}),b.detach().removeData("ttAttrs").removeClass("tt-query").insertAfter(a),a.remove()}var g={wrapper:'<span class="twitter-typeahead"></span>',hint:'<input class="tt-hint" type="text" autocomplete="off" spellcheck="off" disabled>',dropdown:'<span class="tt-dropdown-menu"></span>'},h={wrapper:{position:"relative",display:"inline-block"},hint:{position:"absolute",top:"0",left:"0",borderColor:"transparent",boxShadow:"none"},query:{position:"relative",verticalAlign:"top",backgroundColor:"transparent"},dropdown:{position:"absolute",top:"100%",left:"0",zIndex:"100",display:"none"}};return c.isMsie()&&c.mixin(h.query,{backgroundImage:"url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)"}),c.isMsie()&&c.isMsie()<=7&&(c.mixin(h.wrapper,{display:"inline",zoom:"1"}),c.mixin(h.query,{marginTop:"-1px"})),c.mixin(b.prototype,d,{_managePreventDefault:function(a){var b,c,d=a.data,e=!1;switch(a.type){case"tabKeyed":b=this.inputView.getHintValue(),c=this.inputView.getInputValue(),e=b&&b!==c;break;case"upKeyed":case"downKeyed":e=!d.shiftKey&&!d.ctrlKey&&!d.metaKey}e&&d.preventDefault()},_setLanguageDirection:function(){var a=this.inputView.getLanguageDirection();a!==this.dir&&(this.dir=a,this.$node.css("direction",a),this.dropdownView.setLanguageDirection(a))},_updateHint:function(){var a,b,d,e,f,g=this.dropdownView.getFirstSuggestion(),h=g?g.value:null,i=this.dropdownView.isVisible(),j=this.inputView.isOverflow();h&&i&&!j&&(a=this.inputView.getInputValue(),b=a.replace(/\s{2,}/g," ").replace(/^\s+/g,""),d=c.escapeRegExChars(b),e=new RegExp("^(?:"+d+")(.*$)","i"),f=e.exec(h),this.inputView.setHintValue(a+(f?f[1]:"")))},_clearHint:function(){this.inputView.setHintValue("")},_clearSuggestions:function(){this.dropdownView.clearSuggestions()},_setInputValueToQuery:function(){this.inputView.setInputValue(this.inputView.getQuery())},_setInputValueToSuggestionUnderCursor:function(a){var b=a.data;this.inputView.setInputValue(b.value,!0)},_openDropdown:function(){this.dropdownView.open()},_closeDropdown:function(a){this.dropdownView["blured"===a.type?"closeUnlessMouseIsOverDropdown":"close"]()},_moveDropdownCursor:function(a){var b=a.data;b.shiftKey||b.ctrlKey||b.metaKey||this.dropdownView["upKeyed"===a.type?"moveCursorUp":"moveCursorDown"]()},_handleSelection:function(a){var b="suggestionSelected"===a.type,d=b?a.data:this.dropdownView.getSuggestionUnderCursor();d&&(this.inputView.setInputValue(d.value),b?this.inputView.focus():a.data.preventDefault(),b&&c.isMsie()?c.defer(this.dropdownView.close):this.dropdownView.close(),this.eventBus.trigger("selected",d.datum,d.dataset))},_getSuggestions:function(){var a=this,b=this.inputView.getQuery();c.isBlankString(b)||c.each(this.datasets,function(c,d){d.getSuggestions(b,function(c){b===a.inputView.getQuery()&&a.dropdownView.renderSuggestions(d,c)})})},_autocomplete:function(a){var b,c,d,e,f;("rightKeyed"!==a.type&&"leftKeyed"!==a.type||(b=this.inputView.isCursorAtEnd(),c="ltr"===this.inputView.getLanguageDirection()?"leftKeyed"===a.type:"rightKeyed"===a.type,b&&!c))&&(d=this.inputView.getQuery(),e=this.inputView.getHintValue(),""!==e&&d!==e&&(f=this.dropdownView.getFirstSuggestion(),this.inputView.setInputValue(f.value),this.eventBus.trigger("autocompleted",f.datum,f.dataset)))},_propagateEvent:function(a){this.eventBus.trigger(a.type)},destroy:function(){this.inputView.destroy(),this.dropdownView.destroy(),f(this.$node),this.$node=null},setQuery:function(a){this.inputView.setQuery(a),this.inputView.setInputValue(a),this._clearHint(),this._clearSuggestions(),this._getSuggestions()}}),b}();!function(){var b,d={},f="ttView";b={initialize:function(b){function g(){var b,d=a(this),g=new e({el:d});b=c.map(h,function(a){return a.initialize()}),d.data(f,new l({input:d,eventBus:g=new e({el:d}),datasets:h})),a.when.apply(a,b).always(function(){c.defer(function(){g.trigger("initialized")})})}var h;return b=c.isArray(b)?b:[b],0===b.length&&a.error("no datasets provided"),h=c.map(b,function(a){var b=d[a.name]?d[a.name]:new i(a);return a.name&&(d[a.name]=b),b}),this.each(g)},destroy:function(){function b(){var b=a(this),c=b.data(f);c&&(c.destroy(),b.removeData(f))}return this.each(b)},setQuery:function(b){function c(){var c=a(this).data(f);c&&c.setQuery(b)}return this.each(c)}},jQuery.fn.typeahead=function(a){return b[a]?b[a].apply(this,[].slice.call(arguments,1)):b.initialize.apply(this,arguments)}}()}(window.jQuery);
\ No newline at end of file

From f5eb7c03810aa0b10e8c867b7fbabf75e5055796 Mon Sep 17 00:00:00 2001
From: Jake Harding <jharding@twitter.com>
Date: Sun, 2 Feb 2014 01:49:42 -0800
Subject: [PATCH 17/17] Update bower endpoints.

---
 bower.json | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bower.json b/bower.json
index ced249ac..b65ee186 100644
--- a/bower.json
+++ b/bower.json
@@ -2,9 +2,12 @@
   "name": "typeahead.js",
   "version": "0.9.3",
   "main": [
-    "dist/typeahead.js"
+    "bloodhound.js",
+    "typeahead.jquery.js",
+    "typeahead.bundle.js",
+    "typeahead.bundle.min.js"
   ],
   "dependencies": {
     "jquery": "~1.9"
   }
-}
\ No newline at end of file
+}