From c7dc4cc573c61306ae849d316f432160b16a2099 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sat, 14 Apr 2012 22:43:36 -0700
Subject: change position of var in dropdown + cleanup makefile vars

---
 docs/assets/bootstrap.zip            | Bin 71251 -> 71289 bytes
 docs/assets/js/bootstrap-dropdown.js |   6 +++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'docs')

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 0fd350f5b..58fe79b25 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 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
-- 
cgit v1.2.3