Issue biggora#49

Issue biggora#50
vadimv82 · Nov 9, 2016 · 7dc350a · 7dc350a
1 parent f96c55c
commit 7dc350a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js
@@ -3,7 +3,7 @@
  * Copyright 2012-2016 Twitter Inc.
  * Licensed under MIT (https://github.com/biggora/bootstrap-ajax-typeahead/blob/master/LICENSE)
  * See Demo: http://plugins.upbootstrap.com/bootstrap-ajax-typeahead
- * Updated: 2016-08-02 03:16:15
+ * Updated: 2016-11-09 04:40:04
  *
  * Modifications by Paul Warelis and Alexey Gordeyev
  */
@@ -37,6 +37,7 @@
         that.render = that.options.render || that.render;
         that.onSelect = that.options.onSelect || null;
         that.sorter = that.options.sorter || that.sorter;
+        that.select = that.options.select || that.select;
         that.source = that.options.source || that.source;
         that.displayField = that.options.displayField || that.displayField;
         that.valueField = that.options.valueField || that.valueField;
@@ -95,15 +96,16 @@
                 var value = $selectedItem.attr('data-value');
                 var text = this.$menu.find('.active a').text();
 
+                this.$element
+                    .val(this.updater(text))
+                    .change();
+
                 if (this.options.onSelect) {
                     this.options.onSelect({
                         value: value,
                         text: text
                     });
                 }
-                this.$element
-                    .val(this.updater(text))
-                    .change();
             }
             return this.hide();
         },
@@ -179,7 +181,8 @@
                     data: params,
                     success: $.proxy(this.ajaxSource, this),
                     type: this.ajax.method || 'get',
-                    dataType: 'json'
+                    dataType: 'json',
+                    headers: this.ajax.headers || {}
                 });
                 this.ajax.timerId = null;
             }

diff --git a/js/bootstrap-typeahead.min.js b/js/bootstrap-typeahead.min.js
diff --git a/src/bootstrap-typeahead.js b/src/bootstrap-typeahead.js
@@ -28,6 +28,7 @@
         that.render = that.options.render || that.render;
         that.onSelect = that.options.onSelect || null;
         that.sorter = that.options.sorter || that.sorter;
+        that.select = that.options.select || that.select;
         that.source = that.options.source || that.source;
         that.displayField = that.options.displayField || that.displayField;
         that.valueField = that.options.valueField || that.valueField;
@@ -86,15 +87,16 @@
                 var value = $selectedItem.attr('data-value');
                 var text = this.$menu.find('.active a').text();
 
+                this.$element
+                    .val(this.updater(text))
+                    .change();
+
                 if (this.options.onSelect) {
                     this.options.onSelect({
                         value: value,
                         text: text
                     });
                 }
-                this.$element
-                    .val(this.updater(text))
-                    .change();
             }
             return this.hide();
         },