diff options
| author | Mark Otto <[email protected]> | 2012-04-14 23:07:51 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-04-14 23:07:51 -0700 |
| commit | 2dbce887df8ffec477929c92085745af9b93feaa (patch) | |
| tree | 09fbf6161b08eef8e66a5089b3b1f6886324164f /docs | |
| parent | a6f27ebed440919aac6f62e73e6748bfecd00ab9 (diff) | |
| parent | c7dc4cc573c61306ae849d316f432160b16a2099 (diff) | |
| download | bootstrap-2dbce887df8ffec477929c92085745af9b93feaa.tar.xz bootstrap-2dbce887df8ffec477929c92085745af9b93feaa.zip | |
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 71446 -> 71484 bytes | |||
| -rw-r--r-- | docs/assets/js/bootstrap-dropdown.js | 6 |
2 files changed, 5 insertions, 1 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 4aae825c5..4e3217a76 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/js/bootstrap-dropdown.js b/docs/assets/js/bootstrap-dropdown.js index f27f4d2f4..d856ba6ec 100644 --- a/docs/assets/js/bootstrap-dropdown.js +++ b/docs/assets/js/bootstrap-dropdown.js @@ -40,10 +40,14 @@ , toggle: function (e) { var $this = $(this) - , selector = $this.attr('data-target') , $parent + , selector , isActive + if ($this.is('.disabled, :disabled')) return + + selector = $this.attr('data-target') + if (!selector) { selector = $this.attr('href') selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 |