diff options
| author | Jacob Thornton <[email protected]> | 2012-04-14 22:43:36 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-04-14 22:43:36 -0700 |
| commit | c7dc4cc573c61306ae849d316f432160b16a2099 (patch) | |
| tree | adc20d09c8b62017984bb0d4f69a6b36e88c6343 | |
| parent | ce944421042def2782fc8699e16d872ee6dce4e3 (diff) | |
| download | bootstrap-c7dc4cc573c61306ae849d316f432160b16a2099.tar.xz bootstrap-c7dc4cc573c61306ae849d316f432160b16a2099.zip | |
change position of var in dropdown + cleanup makefile vars
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 71251 -> 71289 bytes | |||
| -rw-r--r-- | docs/assets/js/bootstrap-dropdown.js | 6 | ||||
| -rw-r--r-- | js/bootstrap-dropdown.js | 2 |
4 files changed, 6 insertions, 4 deletions
@@ -2,8 +2,6 @@ BOOTSTRAP = ./docs/assets/css/bootstrap.css BOOTSTRAP_LESS = ./less/bootstrap.less BOOTSTRAP_RESPONSIVE = ./docs/assets/css/bootstrap-responsive.css BOOTSTRAP_RESPONSIVE_LESS = ./less/responsive.less -LESS_COMPRESSOR ?= `which lessc` -WATCHR ?= `which watchr` # # BUILD DOCS diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 0fd350f5b..58fe79b25 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 diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js index 411c2f7bf..d856ba6ec 100644 --- a/js/bootstrap-dropdown.js +++ b/js/bootstrap-dropdown.js @@ -40,8 +40,8 @@ , toggle: function (e) { var $this = $(this) - , selector , $parent + , selector , isActive if ($this.is('.disabled, :disabled')) return |