provide a concatenated js file by default

6 files changed, 7 insertions, 7 deletions

diff --git a/assets/javascripts/bootstrap/carousel.js b/assets/javascripts/bootstrap/carousel.js
index 05631f7..7418ec5 100644
--- a/assets/javascripts/bootstrap/carousel.js
+++ b/assets/javascripts/bootstrap/carousel.js
@@ -202,7 +202,7 @@
     $(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
       var href
       var $this   = $(this)
-      var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
+      var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7
       var options = $.extend({}, $target.data(), $this.data())
       var slideIndex = $this.attr('data-slide-to')
       if (slideIndex) options.interval = false
diff --git a/assets/javascripts/bootstrap/collapse.js b/assets/javascripts/bootstrap/collapse.js
index d37b889..c67939a 100644
--- a/assets/javascripts/bootstrap/collapse.js
+++ b/assets/javascripts/bootstrap/collapse.js
@@ -156,7 +156,7 @@
       var $this   = $(this)
       var target  = $this.attr('data-target')
           || e.preventDefault()
-          || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
+          || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') // strip for ie7
       var $target = $(target)
       var data    = $target.data('bs.collapse')
       var option  = data ? 'toggle' : $this.data()
diff --git a/assets/javascripts/bootstrap/dropdown.js b/assets/javascripts/bootstrap/dropdown.js
index f4f6358..704eda9 100644
--- a/assets/javascripts/bootstrap/dropdown.js
+++ b/assets/javascripts/bootstrap/dropdown.js
@@ -106,7 +106,7 @@
 
       if (!selector) {
         selector = $this.attr('href')
-        selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+        selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
       }
 
       var $parent = selector && $(selector)
diff --git a/assets/javascripts/bootstrap/modal.js b/assets/javascripts/bootstrap/modal.js
index 2241e7b..359e1fc 100644
--- a/assets/javascripts/bootstrap/modal.js
+++ b/assets/javascripts/bootstrap/modal.js
@@ -267,13 +267,13 @@
     $(document).on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) {
       var $this   = $(this)
       var href    = $this.attr('href')
-      var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
+      var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) // strip for ie7
       var option  = $target.data('bs.modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data())
 
       if ($this.is('a')) e.preventDefault()
 
       $target.one('show.bs.modal', function (showEvent) {
-        if (showEvent.isDefaultPrevented()) return  // only register focus restorer if modal will actually get shown
+        if (showEvent.isDefaultPrevented()) return // only register focus restorer if modal will actually get shown
         $target.one('hidden.bs.modal', function () {
           $this.is(':visible') && $this.trigger('focus')
         })
diff --git a/assets/javascripts/bootstrap/tab.js b/assets/javascripts/bootstrap/tab.js
index c812215..de93ec8 100644
--- a/assets/javascripts/bootstrap/tab.js
+++ b/assets/javascripts/bootstrap/tab.js
@@ -30,7 +30,7 @@
 
       if (!selector) {
         selector = $this.attr('href')
-        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
       }
 
       if ($this.parent('li').hasClass('active')) return
diff --git a/assets/javascripts/bootstrap/tooltip.js b/assets/javascripts/bootstrap/tooltip.js
index 38940a3..c62a506 100644
--- a/assets/javascripts/bootstrap/tooltip.js
+++ b/assets/javascripts/bootstrap/tooltip.js
@@ -202,10 +202,10 @@
         var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight)
 
         this.applyPlacement(calculatedOffset, placement)
-        this.hoverState = null
 
         var complete = function () {
           that.$element.trigger('shown.bs.' + that.type)
+          that.hoverState = null
         }
 
         $.support.transition && this.$tip.hasClass('fade') ?