kylefang/bootstrap-tokenfield
1
0
Fork 0
mirror of https://github.com/zhigang1992/bootstrap-tokenfield.git synced 2026-01-12 22:46:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix autocomplete and typeahead options extending

Browse Source
This commit is contained in:
Illimar Tambek
2014-03-06 13:08:03 +02:00
parent 7de42b19cf
commit bf62624bc7
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dist/bootstrap-tokenfield.js vendored
View File

@@ -155,16 +155,18 @@
// Initialize autocomplete, if necessary
if ( ! $.isEmptyObject( this.options.autocomplete ) ) {
var side = this.textDirection === 'rtl' ? 'right' : 'left'
var autocompleteOptions = $.extend({}, this.options.autocomplete, {
var autocompleteOptions = $.extend({
minLength: this.options.showAutocompleteOnFocus ? 0 : null,
position: { my: side + " top", at: side + " bottom", of: this.$wrapper }
})
}, this.options.autocomplete )
this.$input.autocomplete( autocompleteOptions )
}
// Initialize typeahead, if necessary
if ( ! $.isEmptyObject( this.options.typeahead ) ) {
var typeaheadOptions = $.extend({}, this.options.typeahead, {})
var typeaheadOptions = $.extend({
minLength: this.options.showAutocompleteOnFocus ? 0 : null
}, this.options.typeahead)
this.$input.typeahead( null, typeaheadOptions )
this.typeahead = true
}

2
dist/bootstrap-tokenfield.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
js/bootstrap-tokenfield.js vendored
View File

@@ -155,16 +155,18 @@
// Initialize autocomplete, if necessary
if ( ! $.isEmptyObject( this.options.autocomplete ) ) {
var side = this.textDirection === 'rtl' ? 'right' : 'left'
var autocompleteOptions = $.extend({}, this.options.autocomplete, {
var autocompleteOptions = $.extend({
minLength: this.options.showAutocompleteOnFocus ? 0 : null,
position: { my: side + " top", at: side + " bottom", of: this.$wrapper }
})
}, this.options.autocomplete )
this.$input.autocomplete( autocompleteOptions )
}
// Initialize typeahead, if necessary
if ( ! $.isEmptyObject( this.options.typeahead ) ) {
var typeaheadOptions = $.extend({}, this.options.typeahead, {})
var typeaheadOptions = $.extend({
minLength: this.options.showAutocompleteOnFocus ? 0 : null
}, this.options.typeahead)
this.$input.typeahead( null, typeaheadOptions )
this.typeahead = true
}