From 96e5fa6143072db64f34482873c6f7d6b3ec4ffd Mon Sep 17 00:00:00 2001
From: fat <jacobthornton@gmail.com>
Date: Wed, 19 Dec 2012 22:26:36 -0800
Subject: whitespace in tooltip + don't pass empty selector to $() in 
 dropdown.js

---
 js/bootstrap-dropdown.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'js/bootstrap-dropdown.js')

diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js
index f97a81f35..914eabde7 100644
--- a/js/bootstrap-dropdown.js
+++ b/js/bootstrap-dropdown.js
@@ -115,8 +115,9 @@
       selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
     }
 
-    $parent = $(selector)
-    $parent.length || ($parent = $this.parent())
+    $parent = selector && $(selector)
+
+    if (!$parent || !$parent.length) $parent = $this.parent()
 
     return $parent
   }
-- 
cgit v1.2.3