From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 15 Apr 2012 05:43:36 +0000 (-0700)
Subject: change position of var in dropdown + cleanup makefile vars
X-Git-Tag: v2.0.3~5^2~33
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c7dc4cc573c61306ae849d316f432160b16a2099;p=thirdparty%2Fbootstrap.git

change position of var in dropdown + cleanup makefile vars
---

diff --git a/Makefile b/Makefile
index 8f57099b99..a0ad78d694 100644
--- a/Makefile
+++ b/Makefile
@@ -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
index 0fd350f5b5..58fe79b25a 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/js/bootstrap-dropdown.js b/docs/assets/js/bootstrap-dropdown.js
index f27f4d2f43..d856ba6ece 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 411c2f7bfd..d856ba6ece 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