change position of var in dropdown + cleanup makefile vars

diff --git a/Makefile b/Makefile
index 8f57099b99de0b25dc82c34b5d7645edb2e17191..a0ad78d694e53f86184a2ea7cc2aad153275a434 100644 (file)
--- 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 0fd350f5b519a1f35f0a709c686558583e35cc9b..58fe79b25a10ff1ed65dcbf0d229b3ded291f969 100644 (file)
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 f27f4d2f437c4c24345cd2f93305a9d54f1fac26..d856ba6ece56ea1129dd72d7f090b198c6495cb0 100644 (file)
--- 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 411c2f7bfdb6753ef490268044780e601cfcf93c..d856ba6ece56ea1129dd72d7f090b198c6495cb0 100644 (file)
--- 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