mattkennedy · March 2, 2012 20:54 · Feb 23, 2012 · Feb 23, 2012 · Feb 23, 2012 · Feb 23, 2012
diff --git a/README.markdown b/README.markdown
@@ -1,4 +1,4 @@
-# This is an extension to Bootstrap Typeahead that adds minimal but powerful extensions.
+# This is a fork of Bootstrap Typeahead that adds minimal but powerful extensions.
 
 ### For example, process typeahead list asynchronously and return objects
 

diff --git a/README.markdown b/README.markdown
@@ -56,6 +56,6 @@
 
 Note that onselect works without source as a function and vice versa. Events may be a cleaner solution to passing callbacks and using bind all over the place, but I tried to strike a balance between modifying the core source too much and adding functionality, so until further improvements on the original Typeahead source I think these additions are very helpful.
 
-Update 02/23/2012: Fixed a bug
+**Update 02/23/2012: Fixed a bug**
 
 ### Gudbergur Erlendsson, reach me here or gudbergur at gmail
diff --git a/README.markdown b/README.markdown
@@ -56,6 +56,6 @@
 
 Note that onselect works without source as a function and vice versa. Events may be a cleaner solution to passing callbacks and using bind all over the place, but I tried to strike a balance between modifying the core source too much and adding functionality, so until further improvements on the original Typeahead source I think these additions are very helpful.
 
-02/23/2012: Fixed a bug
+Update 02/23/2012: Fixed a bug
 
 ### Gudbergur Erlendsson, reach me here or gudbergur at gmail
diff --git a/README.markdown b/README.markdown
@@ -56,4 +56,6 @@
 
 Note that onselect works without source as a function and vice versa. Events may be a cleaner solution to passing callbacks and using bind all over the place, but I tried to strike a balance between modifying the core source too much and adding functionality, so until further improvements on the original Typeahead source I think these additions are very helpful.
 
+02/23/2012: Fixed a bug
+
 ### Gudbergur Erlendsson, reach me here or gudbergur at gmail
diff --git a/bootstrap-typeahead.js b/bootstrap-typeahead.js
@@ -83,12 +83,12 @@
 
       this.query = this.$element.val()
 
-      if (typeof this.source == "function") 
+      if (typeof this.source == "function") {
         value = this.source(this, this.query)
-        if (value)
-          this.process(value)
-      else 
+        if (value) this.process(value)
+      } else {
         this.process(this.source)
+      }
     }
 
   , process: function (results) {

diff --git a/README.markdown b/README.markdown
@@ -56,4 +56,4 @@
 
 Note that onselect works without source as a function and vice versa. Events may be a cleaner solution to passing callbacks and using bind all over the place, but I tried to strike a balance between modifying the core source too much and adding functionality, so until further improvements on the original Typeahead source I think these additions are very helpful.
 
-- Gudbergur Erlendsson
+### Gudbergur Erlendsson, reach me here or gudbergur at gmail
diff --git a/README.markdown b/README.markdown
@@ -55,3 +55,5 @@
 ```
 
 Note that onselect works without source as a function and vice versa. Events may be a cleaner solution to passing callbacks and using bind all over the place, but I tried to strike a balance between modifying the core source too much and adding functionality, so until further improvements on the original Typeahead source I think these additions are very helpful.
+
+- Gudbergur Erlendsson
diff --git a/README.markdown b/README.markdown
@@ -1,6 +1,6 @@
 # This is an extension to Bootstrap Typeahead that adds minimal but powerful extensions.
 
-### For example, process typeahead list asynchronously, return objects and then fire a callback when one is selected
+### For example, process typeahead list asynchronously and return objects
 
 ```coffeescript
   # This example does an AJAX lookup and is in CoffeeScript
@@ -23,7 +23,7 @@
   )
 ```
 
-### For example, process typeahead list synchronously and call a function on selection
+### For example, process typeahead list synchronously and fire a callback on selection
 
 ```javascript
   // This example is in Javascript, collects html in some li's and returns it

diff --git a/README.markdown b/README.markdown
@@ -54,4 +54,4 @@
   })
 ```
 
-Note that onselect works without source as a function and vice versa. Events may be a cleaner solution to passing callbacks and using bind all over the place, but I think these additions are very helpful.
+Note that onselect works without source as a function and vice versa. Events may be a cleaner solution to passing callbacks and using bind all over the place, but I tried to strike a balance between modifying the core source too much and adding functionality, so until further improvements on the original Typeahead source I think these additions are very helpful.
diff --git a/README.markdown b/README.markdown
@@ -1,4 +1,4 @@
-# This is an extension to Bootstrap Typeahead that adds three minimal but powerful extensions.
+# This is an extension to Bootstrap Typeahead that adds minimal but powerful extensions.
 
 ### For example, process typeahead list asynchronously, return objects and then fire a callback when one is selected
 

diff --git a/README.markdown b/README.markdown
@@ -45,4 +45,13 @@
   })
 ```
 
+### and a very simple example, showing you can pass list of objects as source, and get that object via onselect
+```javascript
+  $('.typeahead').typeahead({
+    // note that "value" is the default setting for the property option
+    source: [{value: 'Charlie'}, {value: 'Gudbergur'}, ...],
+    onselect: function(obj) { console.log(obj) }
+  })
+```
+
 Note that onselect works without source as a function and vice versa. Events may be a cleaner solution to passing callbacks and using bind all over the place, but I think these additions are very helpful.
diff --git a/README.markdown b/README.markdown
@@ -0,0 +1,48 @@
+# This is an extension to Bootstrap Typeahead that adds three minimal but powerful extensions.
+
+### For example, process typeahead list asynchronously, return objects and then fire a callback when one is selected
+
+```coffeescript
+  # This example does an AJAX lookup and is in CoffeeScript
+  $('.typeahead').typeahead(
+    # source can be a function
+    source: (typeahead, query) ->
+      # this function receives the typeahead object and the query string
+      $.ajax(
+        url: "/lookup/?q="+query
+        # i'm binding the function here using CoffeeScript syntactic sugar,
+        # you can use for example Underscore's bind function instead.
+        success: (data) =>
+          # data must be a list of either strings or objects
+          # data = [{'name': 'Joe', }, {'name': 'Henry'}, ...]
+          typeahead.process(data)
+      )
+    # if we return objects to typeahead.process we must specify the property
+    # that typeahead uses to look up the display value
+    property: "name"
+  )
+```
+
+### For example, process typeahead list synchronously and call a function on selection
+
+```javascript
+  // This example is in Javascript, collects html in some li's and returns it
+  $('.typeahead').typeahead({
+    source: function (typeahead, query) {
+      var return_list = []
+      $("li").each(function(i,v){
+        return_list.push($(v).html())
+      })
+      // here I'm just returning a list of strings
+      return return_list
+    },
+    // typeahead calls this function when a object is selected, and
+    // passes an object or string depending on what you processed, in this case a string
+    onselect: function (obj) {
+      alert('Selected '+obj)
+    }
+
+  })
+```
+
+Note that onselect works without source as a function and vice versa. Events may be a cleaner solution to passing callbacks and using bind all over the place, but I think these additions are very helpful.
diff --git a/bootstrap-typeahead.js b/bootstrap-typeahead.js
@@ -0,0 +1,311 @@
+/* =============================================================
+ * bootstrap-typeahead.js v2.0.0
+ * http://twitter.github.com/bootstrap/javascript.html#typeahead
+ * =============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+!function( $ ){
+
+  "use strict"
+
+  var Typeahead = function ( element, options ) {
+    this.$element = $(element)
+    this.options = $.extend({}, $.fn.typeahead.defaults, options)
+    this.matcher = this.options.matcher || this.matcher
+    this.sorter = this.options.sorter || this.sorter
+    this.highlighter = this.options.highlighter || this.highlighter
+    this.$menu = $(this.options.menu).appendTo('body')
+    this.source = this.options.source
+    this.onselect = this.options.onselect
+    this.strings = true
+    this.shown = false
+    this.listen()
+  }
+
+  Typeahead.prototype = {
+
+    constructor: Typeahead
+
+  , select: function () {
+      var val = JSON.parse(this.$menu.find('.active').attr('data-value'))
+        , text
+
+      if (!this.strings) text = val[this.options.property]
+      else text = val
+
+      this.$element.val(text)
+
+      if (typeof this.onselect == "function")
+          this.onselect(val)
+
+      return this.hide()
+    }
+
+  , show: function () {
+      var pos = $.extend({}, this.$element.offset(), {
+        height: this.$element[0].offsetHeight
+      })
+
+      this.$menu.css({
+        top: pos.top + pos.height
+      , left: pos.left
+      })
+
+      this.$menu.show()
+      this.shown = true
+      return this
+    }
+
+  , hide: function () {
+      this.$menu.hide()
+      this.shown = false
+      return this
+    }
+
+  , lookup: function (event) {
+      var that = this
+        , items
+        , q
+        , value
+
+      this.query = this.$element.val()
+
+      if (typeof this.source == "function") 
+        value = this.source(this, this.query)
+        if (value)
+          this.process(value)
+      else 
+        this.process(this.source)
+    }
+
+  , process: function (results) {
+      var that = this
+        , items
+        , q
+
+      if (results.length && typeof results[0] != "string")
+          this.strings = false
+
+      this.query = this.$element.val()
+
+      if (!this.query) {
+        return this.shown ? this.hide() : this
+      }
+
+      items = $.grep(results, function (item) {
+        if (!that.strings)
+          item = item[that.options.property]
+        if (that.matcher(item)) return item
+      })
+
+      items = this.sorter(items)
+
+      if (!items.length) {
+        return this.shown ? this.hide() : this
+      }
+
+      return this.render(items.slice(0, this.options.items)).show()
+    }
+
+  , matcher: function (item) {
+      return ~item.toLowerCase().indexOf(this.query.toLowerCase())
+    }
+
+  , sorter: function (items) {
+      var beginswith = []
+        , caseSensitive = []
+        , caseInsensitive = []
+        , item
+        , sortby
+
+      while (item = items.shift()) {
+        if (this.strings) sortby = item
+        else sortby = item[this.options.property]
+
+        if (!sortby.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item)
+        else if (~sortby.indexOf(this.query)) caseSensitive.push(item)
+        else caseInsensitive.push(item)
+      }
+
+      return beginswith.concat(caseSensitive, caseInsensitive)
+    }
+
+  , highlighter: function (item) {
+      return item.replace(new RegExp('(' + this.query + ')', 'ig'), function ($1, match) {
+        return '<strong>' + match + '</strong>'
+      })
+    }
+
+  , render: function (items) {
+      var that = this
+
+      items = $(items).map(function (i, item) {
+        i = $(that.options.item).attr('data-value', JSON.stringify(item))
+        if (!that.strings)
+            item = item[that.options.property]
+        i.find('a').html(that.highlighter(item))
+        return i[0]
+      })
+
+      items.first().addClass('active')
+      this.$menu.html(items)
+      return this
+    }
+
+  , next: function (event) {
+      var active = this.$menu.find('.active').removeClass('active')
+        , next = active.next()
+
+      if (!next.length) {
+        next = $(this.$menu.find('li')[0])
+      }
+
+      next.addClass('active')
+    }
+
+  , prev: function (event) {
+      var active = this.$menu.find('.active').removeClass('active')
+        , prev = active.prev()
+
+      if (!prev.length) {
+        prev = this.$menu.find('li').last()
+      }
+
+      prev.addClass('active')
+    }
+
+  , listen: function () {
+      this.$element
+        .on('blur',     $.proxy(this.blur, this))
+        .on('keypress', $.proxy(this.keypress, this))
+        .on('keyup',    $.proxy(this.keyup, this))
+
+      if ($.browser.webkit || $.browser.msie) {
+        this.$element.on('keydown', $.proxy(this.keypress, this))
+      }
+
+      this.$menu
+        .on('click', $.proxy(this.click, this))
+        .on('mouseenter', 'li', $.proxy(this.mouseenter, this))
+    }
+
+  , keyup: function (e) {
+      e.stopPropagation()
+      e.preventDefault()
+
+      switch(e.keyCode) {
+        case 40: // down arrow
+        case 38: // up arrow
+          break
+
+        case 9: // tab
+        case 13: // enter
+          if (!this.shown) return
+          this.select()
+          break
+
+        case 27: // escape
+          this.hide()
+          break
+
+        default:
+          this.lookup()
+      }
+
+  }
+
+  , keypress: function (e) {
+      e.stopPropagation()
+      if (!this.shown) return
+
+      switch(e.keyCode) {
+        case 9: // tab
+        case 13: // enter
+        case 27: // escape
+          e.preventDefault()
+          break
+
+        case 38: // up arrow
+          e.preventDefault()
+          this.prev()
+          break
+
+        case 40: // down arrow
+          e.preventDefault()
+          this.next()
+          break
+      }
+    }
+
+  , blur: function (e) {
+      var that = this
+      e.stopPropagation()
+      e.preventDefault()
+      setTimeout(function () { that.hide() }, 150)
+    }
+
+  , click: function (e) {
+      e.stopPropagation()
+      e.preventDefault()
+      this.select()
+    }
+
+  , mouseenter: function (e) {
+      this.$menu.find('.active').removeClass('active')
+      $(e.currentTarget).addClass('active')
+    }
+
+  }
+
+
+  /* TYPEAHEAD PLUGIN DEFINITION
+   * =========================== */
+
+  $.fn.typeahead = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('typeahead')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('typeahead', (data = new Typeahead(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.typeahead.defaults = {
+    source: []
+  , items: 8
+  , menu: '<ul class="typeahead dropdown-menu"></ul>'
+  , item: '<li><a href="#"></a></li>'
+  , onselect: null
+  , property: 'value'
+  }
+
+  $.fn.typeahead.Constructor = Typeahead
+
+
+ /* TYPEAHEAD DATA-API
+  * ================== */
+
+  $(function () {
+    $('body').on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
+      var $this = $(this)
+      if ($this.data('typeahead')) return
+      e.preventDefault()
+      $this.typeahead($this.data())
+    })
+  })
+
+}( window.jQuery );
diff --git a/gistfile1.diff b/gistfile1.diff
@@ -0,0 +1,108 @@
+ /* =============================================================
+  * bootstrap-typeahead.js v2.0.0
+  * http://twitter.github.com/bootstrap/javascript.html#typeahead
+  * =============================================================
+  * Copyright 2012 Twitter, Inc.
+@@ -29,6 +29,8 @@
+     this.highlighter = this.options.highlighter || this.highlighter
+     this.$menu = $(this.options.menu).appendTo('body')
+     this.source = this.options.source
++    this.onselect = this.options.onselect
++    this.strings = true
+     this.shown = false
+     this.listen()
+   }
+@@ -38,8 +40,17 @@
+     constructor: Typeahead
+
+   , select: function () {
+-      var val = this.$menu.find('.active').attr('data-value')
+-      this.$element.val(val)
++      var val = JSON.parse(this.$menu.find('.active').attr('data-value'))
++        , text
++
++      if (!this.strings) text = val[this.options.property]
++      else text = val
++
++      this.$element.val(text)
++
++      if (typeof this.onselect == "function")
++          this.onselect(val)
++
+       return this.hide()
+     }
+
+@@ -68,6 +79,25 @@
+       var that = this
+         , items
+         , q
++        , value
++
++      this.query = this.$element.val()
++
++      if (typeof this.source == "function") 
++        value = this.source(this, this.query)
++        if (value)
++          this.process(value)
++      else 
++        this.process(this.source)
++    }
++
++  , process: function (results) {
++      var that = this
++        , items
++        , q
++
++      if (results.length && typeof results[0] != "string")
++          this.strings = false
+
+       this.query = this.$element.val()
+
+@@ -75,7 +105,9 @@
+         return this.shown ? this.hide() : this
+       }
+
+-      items = $.grep(this.source, function (item) {
++      items = $.grep(results, function (item) {
++        if (!that.strings)
++          item = item[that.options.property]
+         if (that.matcher(item)) return item
+       })
+
+@@ -97,10 +129,14 @@
+         , caseSensitive = []
+         , caseInsensitive = []
+         , item
++        , sortby
+
+       while (item = items.shift()) {
+-        if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item)
+-        else if (~item.indexOf(this.query)) caseSensitive.push(item)
++        if (this.strings) sortby = item
++        else sortby = item[this.options.property]
++
++        if (!sortby.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item)
++        else if (~sortby.indexOf(this.query)) caseSensitive.push(item)
+         else caseInsensitive.push(item)
+       }
+
+@@ -117,7 +153,9 @@
+       var that = this
+
+       items = $(items).map(function (i, item) {
+-        i = $(that.options.item).attr('data-value', item)
++        i = $(that.options.item).attr('data-value', JSON.stringify(item))
++        if (!that.strings)
++            item = item[that.options.property]
+         i.find('a').html(that.highlighter(item))
+         return i[0]
+       })
+@@ -251,6 +289,8 @@
+   , items: 8
+   , menu: '<ul class="typeahead dropdown-menu"></ul>'
+   , item: '<li><a href="#"></a></li>'
++  , onselect: null
++  , property: 'value'
+   }
+
+   $.fn.typeahead.Constructor = Typeahead
No results found