diff options
| author | Mark Otto <[email protected]> | 2013-05-16 20:32:37 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-05-16 20:32:37 -0700 |
| commit | 0f4b4acce1df7f2cdfc6e0ad6dca59480868bd8d (patch) | |
| tree | 55ffc7fe20fbbabbfb6b4cb9a6e6f8d7e94467cf /js/button.js | |
| parent | 8a3e98230544cd2197a57c6e9cb01e3ceeb7a678 (diff) | |
| parent | 2433a076acc4dc318d238fd78361130a92e0a341 (diff) | |
| download | bootstrap-0f4b4acce1df7f2cdfc6e0ad6dca59480868bd8d.tar.xz bootstrap-0f4b4acce1df7f2cdfc6e0ad6dca59480868bd8d.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Diffstat (limited to 'js/button.js')
| -rw-r--r-- | js/button.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/button.js b/js/button.js index f43bba18f..1dbef5ccd 100644 --- a/js/button.js +++ b/js/button.js @@ -74,7 +74,7 @@ var data = $this.data('button') var options = typeof option == 'object' && option - if (!data) $this.data('bs-button', (data = new Button(this, options))) + if (!data) $this.data('bs.button', (data = new Button(this, options))) if (option == 'toggle') data.toggle() else if (option) data.setState(option) @@ -96,7 +96,7 @@ // BUTTON DATA-API // =============== - $(document).on('click.bs-button.bs-data-api', '[data-toggle^=button]', function (e) { + $(document).on('click.bs.button.data-api', '[data-toggle^=button]', function (e) { var $btn = $(e.target) if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') $btn.button('toggle') |