Commit c7dc4cc5 authored by Jacob Thornton's avatar Jacob Thornton

change position of var in dropdown + cleanup makefile vars

parent ce944421
...@@ -2,8 +2,6 @@ BOOTSTRAP = ./docs/assets/css/bootstrap.css ...@@ -2,8 +2,6 @@ BOOTSTRAP = ./docs/assets/css/bootstrap.css
BOOTSTRAP_LESS = ./less/bootstrap.less BOOTSTRAP_LESS = ./less/bootstrap.less
BOOTSTRAP_RESPONSIVE = ./docs/assets/css/bootstrap-responsive.css BOOTSTRAP_RESPONSIVE = ./docs/assets/css/bootstrap-responsive.css
BOOTSTRAP_RESPONSIVE_LESS = ./less/responsive.less BOOTSTRAP_RESPONSIVE_LESS = ./less/responsive.less
LESS_COMPRESSOR ?= `which lessc`
WATCHR ?= `which watchr`
# #
# BUILD DOCS # BUILD DOCS
......
...@@ -40,10 +40,14 @@ ...@@ -40,10 +40,14 @@
, toggle: function (e) { , toggle: function (e) {
var $this = $(this) var $this = $(this)
, selector = $this.attr('data-target')
, $parent , $parent
, selector
, isActive , isActive
if ($this.is('.disabled, :disabled')) return
selector = $this.attr('data-target')
if (!selector) { if (!selector) {
selector = $this.attr('href') selector = $this.attr('href')
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
......
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
, toggle: function (e) { , toggle: function (e) {
var $this = $(this) var $this = $(this)
, selector
, $parent , $parent
, selector
, isActive , isActive
if ($this.is('.disabled, :disabled')) return if ($this.is('.disabled, :disabled')) return
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment