diff options
| author | Mark Otto <[email protected]> | 2011-12-09 11:33:02 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-12-09 11:33:02 -0800 |
| commit | 312ee6cdfb20f7602924c90e6ae37cba62a39da4 (patch) | |
| tree | 1931bb96def7cc20931b6f763fcd934abaeddeb8 /js/bootstrap-button.js | |
| parent | b12b71bf7ca76437a532122d8efff59506b61530 (diff) | |
| parent | cee2f61898f4807311402fed747a93ee68a31f8f (diff) | |
| download | bootstrap-312ee6cdfb20f7602924c90e6ae37cba62a39da4.tar.xz bootstrap-312ee6cdfb20f7602924c90e6ae37cba62a39da4.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
Diffstat (limited to 'js/bootstrap-button.js')
| -rw-r--r-- | js/bootstrap-button.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/js/bootstrap-button.js b/js/bootstrap-button.js index 1cafe4d68..4ed24d98b 100644 --- a/js/bootstrap-button.js +++ b/js/bootstrap-button.js @@ -31,7 +31,9 @@ Button.prototype = { - setState: function (state) { + constructor: Button + + , setState: function (state) { var d = 'disabled' , $el = this.$element , data = $el.data() |