diff options
| author | Mark Otto <[email protected]> | 2012-04-18 09:37:12 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-04-18 09:37:12 -0700 |
| commit | 62a0f5fdcb147df8ec1084af3feba1555bed5669 (patch) | |
| tree | 0729019a92b08cda0ecef3b8bd83bb2b2ce165a5 /docs/assets/js/bootstrap.js | |
| parent | 178a9f3b519342788f653e2d5680913e36da2c4e (diff) | |
| parent | 48e6d88889615e0a9b94156f0f184f787a8810b0 (diff) | |
| download | bootstrap-62a0f5fdcb147df8ec1084af3feba1555bed5669.tar.xz bootstrap-62a0f5fdcb147df8ec1084af3feba1555bed5669.zip | |
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Diffstat (limited to 'docs/assets/js/bootstrap.js')
| -rw-r--r-- | docs/assets/js/bootstrap.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js index 448d97731..abcdbb1e4 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -1565,6 +1565,7 @@ this.matcher = this.options.matcher || this.matcher this.sorter = this.options.sorter || this.sorter this.highlighter = this.options.highlighter || this.highlighter + this.updater = this.options.updater || this.updater this.$menu = $(this.options.menu).appendTo('body') this.source = this.options.source this.shown = false @@ -1578,11 +1579,15 @@ , select: function () { var val = this.$menu.find('.active').attr('data-value') this.$element - .val(val) + .val(this.updater(val)) .change() return this.hide() } + , updater: function (item) { + return item + } + , show: function () { var pos = $.extend({}, this.$element.offset(), { height: this.$element[0].offsetHeight |