diff options
| author | Evan Meagher <[email protected]> | 2011-12-02 10:47:46 -0800 |
|---|---|---|
| committer | Evan Meagher <[email protected]> | 2011-12-02 10:47:46 -0800 |
| commit | 3726df695eedecee323920305cb5d486a787acd6 (patch) | |
| tree | cc1727ab482f0ddc35ed84da330802c180bcb860 /js/bootstrap-button.js | |
| parent | 61e84d8762d79befb2d75685705fd4e451a609fe (diff) | |
| parent | cee2f61898f4807311402fed747a93ee68a31f8f (diff) | |
| download | bootstrap-3726df695eedecee323920305cb5d486a787acd6.tar.xz bootstrap-3726df695eedecee323920305cb5d486a787acd6.zip | |
Merge remote-tracking branch 'upstream/2.0-wip' into add-vertical-nav-divider
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() |