From ccd4c9d7b5f90cbbef7f2c9d6b9b3dec615185fc Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Wed, 31 Jul 2013 22:28:05 -0700
Subject: fixes #8864

---
 js/tooltip.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'js')

diff --git a/js/tooltip.js b/js/tooltip.js
index a954923be..30e3ae140 100644
--- a/js/tooltip.js
+++ b/js/tooltip.js
@@ -249,6 +249,8 @@
     var $tip = this.tip()
     var e    = $.Event('hide.bs.' + this.type)
 
+    function complete() { $tip.detach() }
+
     this.$element.trigger(e)
 
     if (e.isDefaultPrevented()) return
@@ -257,9 +259,9 @@
 
     $.support.transition && this.$tip.hasClass('fade') ?
       $tip
-        .one($.support.transition.end, $tip.detach)
+        .one($.support.transition.end, complete)
         .emulateTransitionEnd(150) :
-      $tip.detach()
+      complete()
 
     this.$element.trigger('hidden.bs.' + this.type)
 
-- 
cgit v1.2.3


From 7a3c61ee33b8a07de20b2d30ed2bcd5fd7649fd6 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Wed, 31 Jul 2013 22:57:00 -0700
Subject: fixes #8892

---
 js/collapse.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/collapse.js b/js/collapse.js
index 34ac3c7fa..ab575515d 100644
--- a/js/collapse.js
+++ b/js/collapse.js
@@ -48,7 +48,7 @@
     this.$element.trigger(startEvent)
     if (startEvent.isDefaultPrevented()) return
 
-    var actives   = this.$parent && this.$parent.find('> .accordion-group > .in')
+    var actives = this.$parent && this.$parent.find('> .accordion-group > .in')
 
     if (actives && actives.length) {
       var hasData = actives.data('bs.collapse')
-- 
cgit v1.2.3


From f6cec812a6a0a4488fc675bbe7d02cfe7d1f7a2d Mon Sep 17 00:00:00 2001
From: fat <jacobthornton@gmail.com>
Date: Fri, 2 Aug 2013 15:13:12 -0700
Subject: fixes #8957

---
 js/button.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/button.js b/js/button.js
index ae5602fc2..fc73b555f 100644
--- a/js/button.js
+++ b/js/button.js
@@ -56,7 +56,9 @@
     var $parent = this.$element.closest('[data-toggle="buttons"]')
 
     if ($parent.length) {
-      var $input = this.$element.find('input').prop('checked', !this.$element.hasClass('active'))
+      var $input = this.$element.find('input')
+        .prop('checked', !this.$element.hasClass('active'))
+        .trigger('change')
       if ($input.prop('type') === 'radio') $parent.find('.active').removeClass('active')
     }
 
-- 
cgit v1.2.3


From 2b6ec389876fac116ae2a152e47be321632dd9ba Mon Sep 17 00:00:00 2001
From: fat <jacobthornton@gmail.com>
Date: Sun, 4 Aug 2013 17:22:49 -0700
Subject: fixes #8880

---
 js/popover.js |  4 ++++
 js/tooltip.js | 36 ++++++++++++++++++++++++------------
 2 files changed, 28 insertions(+), 12 deletions(-)

(limited to 'js')

diff --git a/js/popover.js b/js/popover.js
index b5888b6e4..feee3308d 100644
--- a/js/popover.js
+++ b/js/popover.js
@@ -75,6 +75,10 @@
             o.content)
   }
 
+  Popover.prototype.arrow =function () {
+    return this.$arrow = this.$arrow || this.tip().find('.arrow')
+  }
+
   Popover.prototype.tip = function () {
     if (!this.$tip) this.$tip = $(this.options.template)
     return this.$tip
diff --git a/js/tooltip.js b/js/tooltip.js
index 30e3ae140..3f9df0340 100644
--- a/js/tooltip.js
+++ b/js/tooltip.js
@@ -179,12 +179,9 @@
           .addClass(placement)
       }
 
-      var tp = placement == 'bottom' ? { top: pos.top + pos.height,   left: pos.left + pos.width / 2 - actualWidth / 2  } :
-               placement == 'top'    ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2  } :
-               placement == 'left'   ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } :
-            /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width   }
+      var calculatedOffset = this.getCalcuatedOffset(placement, pos, actualWidth, actualHeight)
 
-      this.applyPlacement(tp, placement)
+      this.applyPlacement(calculatedOffset, placement)
       this.$element.trigger('shown.bs.' + this.type)
     }
   }
@@ -196,25 +193,33 @@
     var height = $tip[0].offsetHeight
 
     // manually read margins because getBoundingClientRect includes difference
-    offset.top  = offset.top  + parseInt($tip.css('margin-top'), 10)
-    offset.left = offset.left + parseInt($tip.css('margin-left'), 10)
+    var marginTop = parseInt($tip.css('margin-top'), 10)
+    var marginLeft = parseInt($tip.css('margin-left'), 10)
+
+    // we must check for NaN for ie 8/9
+    if (isNaN(marginTop))  marginTop  = 0
+    if (isNaN(marginLeft)) marginLeft = 0
+
+    offset.top  = offset.top  + marginTop
+    offset.left = offset.left + marginLeft
 
     $tip
       .offset(offset)
       .addClass('in')
 
+    // check to see if placing tip in new offset caused the tip to resize itself
     var actualWidth  = $tip[0].offsetWidth
     var actualHeight = $tip[0].offsetHeight
 
     if (placement == 'top' && actualHeight != height) {
       replace = true
-      offset.top  = offset.top + height - actualHeight
+      offset.top = offset.top + height - actualHeight
     }
 
-    if (placement == 'bottom' || placement == 'top') {
+    if (/bottom|top/.test(placement)) {
       var delta = 0
 
-      if (offset.left < 0){
+      if (offset.left < 0) {
         delta       = offset.left * -2
         offset.left = 0
 
@@ -287,6 +292,13 @@
     }, this.$element.offset())
   }
 
+  Tooltip.prototype.getCalcuatedOffset = function (placement, pos, actualWidth, actualHeight) {
+    return placement == 'bottom' ? { top: pos.top + pos.height,   left: pos.left + pos.width / 2 - actualWidth / 2  } :
+           placement == 'top'    ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2  } :
+           placement == 'left'   ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } :
+        /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width   }
+  }
+
   Tooltip.prototype.getTitle = function () {
     var title
     var $e = this.$element
@@ -302,8 +314,8 @@
     return this.$tip = this.$tip || $(this.options.template)
   }
 
-  Tooltip.prototype.arrow =function(){
-    return this.$arrow = this.$arrow || this.tip().find(".tooltip-arrow")
+  Tooltip.prototype.arrow =function () {
+    return this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow')
   }
 
   Tooltip.prototype.validate = function () {
-- 
cgit v1.2.3


From 180034a4b450fb4a6567d6dbaaeb680905d798c4 Mon Sep 17 00:00:00 2001
From: Chris Rebert <github@rebertia.com>
Date: Sun, 4 Aug 2013 17:36:08 -0700
Subject: tooltip.js: add missing space

---
 js/tooltip.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/tooltip.js b/js/tooltip.js
index 3f9df0340..8f2beedce 100644
--- a/js/tooltip.js
+++ b/js/tooltip.js
@@ -314,7 +314,7 @@
     return this.$tip = this.$tip || $(this.options.template)
   }
 
-  Tooltip.prototype.arrow =function () {
+  Tooltip.prototype.arrow = function () {
     return this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow')
   }
 
-- 
cgit v1.2.3


From 700e742a9cfac5e90ff882a5437e95691b090de0 Mon Sep 17 00:00:00 2001
From: Jason Diamond <jason@diamond.name>
Date: Sun, 4 Aug 2013 23:59:30 -0700
Subject: failing test for dot in data-parent

---
 js/tests/unit/collapse.js | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

(limited to 'js')

diff --git a/js/tests/unit/collapse.js b/js/tests/unit/collapse.js
index 73799c75d..11b2cf838 100644
--- a/js/tests/unit/collapse.js
+++ b/js/tests/unit/collapse.js
@@ -126,4 +126,39 @@ $(function () {
         target3.click()
       })
 
+      test("should allow dots in data-parent", function () {
+        $.support.transition = false
+        stop()
+
+        var accordion = $('<div class="accordion"><div class="accordion-group"></div><div class="accordion-group"></div><div class="accordion-group"></div></div>')
+          .appendTo($('#qunit-fixture'))
+
+        var target1 = $('<a data-toggle="collapse" href="#body1" data-parent=".accordion"></a>')
+          .appendTo(accordion.find('.accordion-group').eq(0))
+
+        var collapsible1 = $('<div id="body1" class="in"></div>')
+          .appendTo(accordion.find('.accordion-group').eq(0))
+
+        var target2 = $('<a class="collapsed" data-toggle="collapse" href="#body2" data-parent=".accordion"></a>')
+          .appendTo(accordion.find('.accordion-group').eq(1))
+
+        var collapsible2 = $('<div id="body2"></div>')
+          .appendTo(accordion.find('.accordion-group').eq(1))
+
+        var target3 = $('<a class="collapsed" data-toggle="collapse" href="#body3" data-parent=".accordion"></a>')
+          .appendTo(accordion.find('.accordion-group').eq(2))
+
+        var collapsible3 = $('<div id="body3"></div>')
+          .appendTo(accordion.find('.accordion-group').eq(2))
+          .on('show.bs.collapse', function () {
+            ok(target1.hasClass('collapsed'))
+            ok(target2.hasClass('collapsed'))
+            ok(!target3.hasClass('collapsed'))
+
+            start()
+          })
+
+        target3.click()
+      })
+
 })
-- 
cgit v1.2.3


From fb57eda26857f1312e4415926135e675895b13e1 Mon Sep 17 00:00:00 2001
From: Jason Diamond <jason@diamond.name>
Date: Sun, 4 Aug 2013 23:59:57 -0700
Subject: use quotes to allow dots in data-parent

---
 js/collapse.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/collapse.js b/js/collapse.js
index ab575515d..b20022a2e 100644
--- a/js/collapse.js
+++ b/js/collapse.js
@@ -169,7 +169,7 @@
     var $parent = parent && $(parent)
 
     if (!data || !data.transitioning) {
-      if ($parent) $parent.find('[data-toggle=collapse][data-parent=' + parent + ']').not($this).addClass('collapsed')
+      if ($parent) $parent.find('[data-toggle=collapse][data-parent="' + parent + '"]').not($this).addClass('collapsed')
       $this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
     }
 
-- 
cgit v1.2.3


From f266595092cd43aead1f6617933554110aeb46ac Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Tue, 6 Aug 2013 11:18:12 -0700
Subject: Fixes #9150: Hide popover titles in IE8

Properly hides popover titles in IE8 because apparently it doesn't
accept the `:empty` selector. /cc @fat @cvrebert
---
 js/popover.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/popover.js b/js/popover.js
index feee3308d..4d4979247 100644
--- a/js/popover.js
+++ b/js/popover.js
@@ -58,7 +58,13 @@
 
     $tip.removeClass('fade top bottom left right in')
 
-    $tip.find('.popover-title:empty').hide()
+    // Hide empty titles
+    //
+    // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do
+    // this manually by checking the contents.
+    if ($tip.find('.popover-title').html() === '') {
+      $tip.find('.popover-title').hide();
+    }
   }
 
   Popover.prototype.hasContent = function () {
-- 
cgit v1.2.3


From f816a18f7980d22de07f6e341551af68c3ba7958 Mon Sep 17 00:00:00 2001
From: Braden Whitten <bwhitten@buffalo.edu>
Date: Tue, 6 Aug 2013 17:02:57 -0400
Subject: Fix spacing after '='

Just added a space after a function definition to tidy up the code.
---
 js/popover.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/popover.js b/js/popover.js
index 4d4979247..24b85715f 100644
--- a/js/popover.js
+++ b/js/popover.js
@@ -81,7 +81,7 @@
             o.content)
   }
 
-  Popover.prototype.arrow =function () {
+  Popover.prototype.arrow = function () {
     return this.$arrow = this.$arrow || this.tip().find('.arrow')
   }
 
-- 
cgit v1.2.3


From f86f6ee9555819468467d48387becf80c831d34f Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Thu, 8 Aug 2013 13:29:46 -0700
Subject: fix 'Calcuated' typo & run grunt; thanks @FagnerMartinsBrack

fixes typo introduced in 2b6ec389876fac116ae2a152e47be321632dd9ba
---
 js/tooltip.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js')

diff --git a/js/tooltip.js b/js/tooltip.js
index 8f2beedce..cd4ee50ed 100644
--- a/js/tooltip.js
+++ b/js/tooltip.js
@@ -179,7 +179,7 @@
           .addClass(placement)
       }
 
-      var calculatedOffset = this.getCalcuatedOffset(placement, pos, actualWidth, actualHeight)
+      var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight)
 
       this.applyPlacement(calculatedOffset, placement)
       this.$element.trigger('shown.bs.' + this.type)
@@ -292,7 +292,7 @@
     }, this.$element.offset())
   }
 
-  Tooltip.prototype.getCalcuatedOffset = function (placement, pos, actualWidth, actualHeight) {
+  Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) {
     return placement == 'bottom' ? { top: pos.top + pos.height,   left: pos.left + pos.width / 2 - actualWidth / 2  } :
            placement == 'top'    ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2  } :
            placement == 'left'   ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } :
-- 
cgit v1.2.3


From dbed9da77403337235acb652c3128ebc84672d60 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Fri, 9 Aug 2013 00:16:47 -0700
Subject: fixes #6159

---
 js/modal.js | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'js')

diff --git a/js/modal.js b/js/modal.js
index d53cc9eaf..89c705a38 100644
--- a/js/modal.js
+++ b/js/modal.js
@@ -38,13 +38,13 @@
     , show: true
   }
 
-  Modal.prototype.toggle = function () {
-    return this[!this.isShown ? 'show' : 'hide']()
+  Modal.prototype.toggle = function (_relatedTarget) {
+    return this[!this.isShown ? 'show' : 'hide'](_relatedTarget)
   }
 
-  Modal.prototype.show = function () {
+  Modal.prototype.show = function (_relatedTarget) {
     var that = this
-    var e    = $.Event('show.bs.modal')
+    var e    = $.Event('show.bs.modal', { relatedTarget: _relatedTarget })
 
     this.$element.trigger(e)
 
@@ -73,13 +73,15 @@
 
       that.enforceFocus()
 
+      var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget })
+
       transition ?
         that.$element
           .one($.support.transition.end, function () {
-            that.$element.focus().trigger('shown.bs.modal')
+            that.$element.focus().trigger(e)
           })
           .emulateTransitionEnd(300) :
-        that.$element.focus().trigger('shown.bs.modal')
+        that.$element.focus().trigger(e)
     })
   }
 
@@ -192,15 +194,15 @@
 
   var old = $.fn.modal
 
-  $.fn.modal = function (option) {
+  $.fn.modal = function (option, _relatedTarget) {
     return this.each(function () {
       var $this   = $(this)
       var data    = $this.data('bs.modal')
       var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option)
 
       if (!data) $this.data('bs.modal', (data = new Modal(this, options)))
-      if (typeof option == 'string') data[option]()
-      else if (options.show) data.show()
+      if (typeof option == 'string') data[option](_relatedTarget)
+      else if (options.show) data.show(_relatedTarget)
     })
   }
 
@@ -223,12 +225,12 @@
     var $this   = $(this)
     var href    = $this.attr('href')
     var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
-    var option  = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data())
+    var option  = $target.data('modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data())
 
     e.preventDefault()
 
     $target
-      .modal(option)
+      .modal(option, this)
       .one('hide', function () {
         $this.is(':visible') && $this.focus()
       })
-- 
cgit v1.2.3


From a4f0e8d37ab109c3f4476877854d4aea149fb1f2 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sat, 10 Aug 2013 13:35:20 -0700
Subject: fixes #9111

---
 js/modal.js            |   3 +-
 js/tests/unit/modal.js | 301 ++++++++++++++++++++++++++-----------------------
 2 files changed, 163 insertions(+), 141 deletions(-)

(limited to 'js')

diff --git a/js/modal.js b/js/modal.js
index 89c705a38..ff3de1d94 100644
--- a/js/modal.js
+++ b/js/modal.js
@@ -103,6 +103,7 @@
     this.$element
       .removeClass('in')
       .attr('aria-hidden', true)
+      .off('click.dismiss.modal')
 
     $.support.transition && this.$element.hasClass('fade') ?
       this.$element
@@ -155,7 +156,7 @@
       this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
         .appendTo(document.body)
 
-      this.$element.on('click', $.proxy(function (e) {
+      this.$element.on('click.dismiss.modal', $.proxy(function (e) {
         if (e.target !== e.currentTarget) return
         this.options.backdrop == 'static'
           ? this.$element[0].focus.call(this.$element[0])
diff --git a/js/tests/unit/modal.js b/js/tests/unit/modal.js
index 90762ea90..2c610d83d 100644
--- a/js/tests/unit/modal.js
+++ b/js/tests/unit/modal.js
@@ -1,156 +1,177 @@
 $(function () {
 
-    module("modal")
+  module("modal")
 
-      test("should provide no conflict", function () {
-        var modal = $.fn.modal.noConflict()
-        ok(!$.fn.modal, 'modal was set back to undefined (org value)')
-        $.fn.modal = modal
-      })
+    test("should provide no conflict", function () {
+      var modal = $.fn.modal.noConflict()
+      ok(!$.fn.modal, 'modal was set back to undefined (org value)')
+      $.fn.modal = modal
+    })
 
-      test("should be defined on jquery object", function () {
-        var div = $("<div id='modal-test'></div>")
-        ok(div.modal, 'modal method is defined')
-      })
+    test("should be defined on jquery object", function () {
+      var div = $("<div id='modal-test'></div>")
+      ok(div.modal, 'modal method is defined')
+    })
 
-      test("should return element", function () {
-        var div = $("<div id='modal-test'></div>")
-        ok(div.modal() == div, 'document.body returned')
-        $('#modal-test').remove()
-      })
+    test("should return element", function () {
+      var div = $("<div id='modal-test'></div>")
+      ok(div.modal() == div, 'document.body returned')
+      $('#modal-test').remove()
+    })
 
-      test("should expose defaults var for settings", function () {
-        ok($.fn.modal.Constructor.DEFAULTS, 'default object exposed')
-      })
+    test("should expose defaults var for settings", function () {
+      ok($.fn.modal.Constructor.DEFAULTS, 'default object exposed')
+    })
 
-      test("should insert into dom when show method is called", function () {
-        stop()
-        $.support.transition = false
-        $("<div id='modal-test'></div>")
-          .on("shown.bs.modal", function () {
-            ok($('#modal-test').length, 'modal inserted into dom')
-            $(this).remove()
-            start()
-          })
-          .modal("show")
-      })
+    test("should insert into dom when show method is called", function () {
+      stop()
+      $.support.transition = false
+      $("<div id='modal-test'></div>")
+        .on("shown.bs.modal", function () {
+          ok($('#modal-test').length, 'modal inserted into dom')
+          $(this).remove()
+          start()
+        })
+        .modal("show")
+    })
 
-      test("should fire show event", function () {
-        stop()
-        $.support.transition = false
-        $("<div id='modal-test'></div>")
-          .on("show.bs.modal", function () {
-            ok(true, "show was called")
-          })
-          .on("shown.bs.modal", function () {
-            $(this).remove()
-            start()
-          })
-          .modal("show")
-      })
+    test("should fire show event", function () {
+      stop()
+      $.support.transition = false
+      $("<div id='modal-test'></div>")
+        .on("show.bs.modal", function () {
+          ok(true, "show was called")
+        })
+        .on("shown.bs.modal", function () {
+          $(this).remove()
+          start()
+        })
+        .modal("show")
+    })
 
-      test("should not fire shown when default prevented", function () {
-        stop()
-        $.support.transition = false
-        $("<div id='modal-test'></div>")
-          .on("show.bs.modal", function (e) {
-            e.preventDefault()
-            ok(true, "show was called")
-            start()
-          })
-          .on("shown.bs.modal", function () {
-            ok(false, "shown was called")
-          })
-          .modal("show")
-      })
+    test("should not fire shown when default prevented", function () {
+      stop()
+      $.support.transition = false
+      $("<div id='modal-test'></div>")
+        .on("show.bs.modal", function (e) {
+          e.preventDefault()
+          ok(true, "show was called")
+          start()
+        })
+        .on("shown.bs.modal", function () {
+          ok(false, "shown was called")
+        })
+        .modal("show")
+    })
 
-      test("should hide modal when hide is called", function () {
-        stop()
-        $.support.transition = false
+    test("should hide modal when hide is called", function () {
+      stop()
+      $.support.transition = false
 
-        $("<div id='modal-test'></div>")
-          .on("shown.bs.modal", function () {
-            ok($('#modal-test').is(":visible"), 'modal visible')
-            ok($('#modal-test').length, 'modal inserted into dom')
-            $(this).modal("hide")
-          })
-          .on("hidden.bs.modal", function() {
-            ok(!$('#modal-test').is(":visible"), 'modal hidden')
-            $('#modal-test').remove()
-            start()
-          })
-          .modal("show")
-      })
+      $("<div id='modal-test'></div>")
+        .on("shown.bs.modal", function () {
+          ok($('#modal-test').is(":visible"), 'modal visible')
+          ok($('#modal-test').length, 'modal inserted into dom')
+          $(this).modal("hide")
+        })
+        .on("hidden.bs.modal", function() {
+          ok(!$('#modal-test').is(":visible"), 'modal hidden')
+          $('#modal-test').remove()
+          start()
+        })
+        .modal("show")
+    })
 
-      test("should toggle when toggle is called", function () {
-        stop()
-        $.support.transition = false
-        var div = $("<div id='modal-test'></div>")
-        div
-          .on("shown.bs.modal", function () {
-            ok($('#modal-test').is(":visible"), 'modal visible')
-            ok($('#modal-test').length, 'modal inserted into dom')
-            div.modal("toggle")
-          })
-          .on("hidden.bs.modal", function() {
-            ok(!$('#modal-test').is(":visible"), 'modal hidden')
-            div.remove()
-            start()
-          })
-          .modal("toggle")
-      })
+    test("should toggle when toggle is called", function () {
+      stop()
+      $.support.transition = false
+      var div = $("<div id='modal-test'></div>")
+      div
+        .on("shown.bs.modal", function () {
+          ok($('#modal-test').is(":visible"), 'modal visible')
+          ok($('#modal-test').length, 'modal inserted into dom')
+          div.modal("toggle")
+        })
+        .on("hidden.bs.modal", function() {
+          ok(!$('#modal-test').is(":visible"), 'modal hidden')
+          div.remove()
+          start()
+        })
+        .modal("toggle")
+    })
 
-      test("should remove from dom when click [data-dismiss=modal]", function () {
-        stop()
-        $.support.transition = false
-        var div = $("<div id='modal-test'><span class='close' data-dismiss='modal'></span></div>")
-        div
-          .on("shown.bs.modal", function () {
-            ok($('#modal-test').is(":visible"), 'modal visible')
-            ok($('#modal-test').length, 'modal inserted into dom')
-            div.find('.close').click()
-          })
-          .on("hidden.bs.modal", function() {
-            ok(!$('#modal-test').is(":visible"), 'modal hidden')
-            div.remove()
-            start()
-          })
-          .modal("toggle")
-      })
+    test("should remove from dom when click [data-dismiss=modal]", function () {
+      stop()
+      $.support.transition = false
+      var div = $("<div id='modal-test'><span class='close' data-dismiss='modal'></span></div>")
+      div
+        .on("shown.bs.modal", function () {
+          ok($('#modal-test').is(":visible"), 'modal visible')
+          ok($('#modal-test').length, 'modal inserted into dom')
+          div.find('.close').click()
+        })
+        .on("hidden.bs.modal", function() {
+          ok(!$('#modal-test').is(":visible"), 'modal hidden')
+          div.remove()
+          start()
+        })
+        .modal("toggle")
+    })
 
-      test("should allow modal close with 'backdrop:false'", function () {
-        stop()
-        $.support.transition = false
-        var div = $("<div>", { id: 'modal-test', "data-backdrop": false })
-        div
-          .on("shown.bs.modal", function () {
-            ok($('#modal-test').is(":visible"), 'modal visible')
-            div.modal("hide")
-          })
-          .on("hidden.bs.modal", function() {
-            ok(!$('#modal-test').is(":visible"), 'modal hidden')
-            div.remove()
-            start()
-          })
-          .modal("show")
-      })
+    test("should allow modal close with 'backdrop:false'", function () {
+      stop()
+      $.support.transition = false
+      var div = $("<div>", { id: 'modal-test', "data-backdrop": false })
+      div
+        .on("shown.bs.modal", function () {
+          ok($('#modal-test').is(":visible"), 'modal visible')
+          div.modal("hide")
+        })
+        .on("hidden.bs.modal", function() {
+          ok(!$('#modal-test').is(":visible"), 'modal hidden')
+          div.remove()
+          start()
+        })
+        .modal("show")
+    })
 
-      test("should close modal when clicking outside of modal-content", function () {
-        stop()
-        $.support.transition = false
-        var div = $("<div id='modal-test'><div class='contents'></div></div>")
-        div
-          .bind("shown.bs.modal", function () {
-            ok($('#modal-test').length, 'modal insterted into dom')
-            $('.contents').click()
-            ok($('#modal-test').is(":visible"), 'modal visible')
-            $('#modal-test').click()
-          })
-          .bind("hidden.bs.modal", function() {
-            ok(!$('#modal-test').is(":visible"), 'modal hidden')
-            div.remove()
-            start()
-          })
-          .modal("show")
-      })
+    test("should close modal when clicking outside of modal-content", function () {
+      stop()
+      $.support.transition = false
+      var div = $("<div id='modal-test'><div class='contents'></div></div>")
+      div
+        .bind("shown.bs.modal", function () {
+          ok($('#modal-test').length, 'modal insterted into dom')
+          $('.contents').click()
+          ok($('#modal-test').is(":visible"), 'modal visible')
+          $('#modal-test').click()
+        })
+        .bind("hidden.bs.modal", function() {
+          ok(!$('#modal-test').is(":visible"), 'modal hidden')
+          div.remove()
+          start()
+        })
+        .modal("show")
+    })
+
+    test("should trigger hide event once when clicking outside of modal-content", function () {
+      stop()
+      $.support.transition = false
+      var div = $("<div id='modal-test'><div class='contents'></div></div>")
+      var triggered
+      div
+        .bind("shown.bs.modal", function () {
+          triggered = 0
+          $('#modal-test').click()
+        })
+        .one("hidden.bs.modal", function() {
+          div.modal("show")
+        })
+        .bind("hide.bs.modal", function () {
+          triggered += 1
+          ok(triggered === 1, 'modal hide triggered once')
+          start()
+        })
+        .modal("show")
+    })
 })
-- 
cgit v1.2.3


From 1abb7947c2b24041efe02ae8e243e62e6afeb2c8 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sat, 10 Aug 2013 14:09:05 -0700
Subject: fixes #9222

---
 js/popover.js |  6 +-----
 js/tooltip.js | 16 ++++++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'js')

diff --git a/js/popover.js b/js/popover.js
index 24b85715f..ecd37ac23 100644
--- a/js/popover.js
+++ b/js/popover.js
@@ -58,13 +58,9 @@
 
     $tip.removeClass('fade top bottom left right in')
 
-    // Hide empty titles
-    //
     // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do
     // this manually by checking the contents.
-    if ($tip.find('.popover-title').html() === '') {
-      $tip.find('.popover-title').hide();
-    }
+    if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide()
   }
 
   Popover.prototype.hasContent = function () {
diff --git a/js/tooltip.js b/js/tooltip.js
index cd4ee50ed..eedadcbe9 100644
--- a/js/tooltip.js
+++ b/js/tooltip.js
@@ -64,7 +64,7 @@
         var eventIn  = trigger == 'hover' ? 'mouseenter' : 'focus'
         var eventOut = trigger == 'hover' ? 'mouseleave' : 'blur'
 
-        this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
+        this.$element.on(eventIn  + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
         this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
       }
     }
@@ -91,16 +91,20 @@
     return options
   }
 
-  Tooltip.prototype.enter = function (obj) {
-    var defaults = this.getDefaults()
+  Tooltip.prototype.getDelegateOptions = function () {
     var options  = {}
+    var defaults = this.getDefaults()
 
     this._options && $.each(this._options, function (key, value) {
       if (defaults[key] != value) options[key] = value
     })
 
+    return options
+  }
+
+  Tooltip.prototype.enter = function (obj) {
     var self = obj instanceof this.constructor ?
-      obj : $(obj.currentTarget)[this.type](options).data('bs.' + this.type)
+      obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type)
 
     clearTimeout(self.timeout)
 
@@ -114,7 +118,7 @@
 
   Tooltip.prototype.leave = function (obj) {
     var self = obj instanceof this.constructor ?
-      obj : $(obj.currentTarget)[this.type](this._options).data('bs.' + this.type)
+      obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type)
 
     clearTimeout(self.timeout)
 
@@ -339,7 +343,7 @@
   }
 
   Tooltip.prototype.toggle = function (e) {
-    var self = e ? $(e.currentTarget)[this.type](this._options).data('bs.' + this.type) : this
+    var self = e ? $(e.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type) : this
     self.tip().hasClass('in') ? self.leave(self) : self.enter(self)
   }
 
-- 
cgit v1.2.3


From 6393a78bf01c9347f2ab0e6db46127bf43a5727c Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 11 Aug 2013 14:32:32 -0700
Subject: fixes #9279

---
 js/modal.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'js')

diff --git a/js/modal.js b/js/modal.js
index ff3de1d94..420f13d5f 100644
--- a/js/modal.js
+++ b/js/modal.js
@@ -237,10 +237,8 @@
       })
   })
 
-  $(function () {
-    var $body = $(document.body)
-      .on('shown.bs.modal',  '.modal', function () { $body.addClass('modal-open') })
-      .on('hidden.bs.modal', '.modal', function () { $body.removeClass('modal-open') })
-  })
+  $(document)
+    .on('shown.bs.modal',  '.modal', function () { $(document.body).addClass('modal-open') })
+    .on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') })
 
 }(window.jQuery);
-- 
cgit v1.2.3


From bf2ab457eae6d54954b8e2a22596bcdd216d0ca5 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 11 Aug 2013 14:59:39 -0700
Subject: fix comment in tooltip

---
 js/tooltip.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/tooltip.js b/js/tooltip.js
index eedadcbe9..e0732a5a9 100644
--- a/js/tooltip.js
+++ b/js/tooltip.js
@@ -1,6 +1,6 @@
 /* ========================================================================
  * Bootstrap: tooltip.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#affix
+ * http://twbs.github.com/bootstrap/javascript.html#tooltip
  * Inspired by the original jQuery.tipsy by Jason Frame
  * ========================================================================
  * Copyright 2012 Twitter, Inc.
-- 
cgit v1.2.3


From 89b3cb0dacd71fc7b20e125851f05f9ed266b50d Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 11 Aug 2013 15:17:04 -0700
Subject: fixes #9318

---
 js/modal.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/modal.js b/js/modal.js
index 420f13d5f..e0f8b7a0e 100644
--- a/js/modal.js
+++ b/js/modal.js
@@ -29,7 +29,7 @@
     this.$backdrop =
     this.isShown   = null
 
-    if (this.options.remote) this.$element.find('.modal-body').load(this.options.remote)
+    if (this.options.remote) this.$element.load(this.options.remote)
   }
 
   Modal.DEFAULTS = {
-- 
cgit v1.2.3


From 92c2ad98e753c64a2bd6e3fb94870a2ad3ee0333 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 11 Aug 2013 15:41:06 -0700
Subject: fixes #8983

---
 js/carousel.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'js')

diff --git a/js/carousel.js b/js/carousel.js
index d4bcb88b7..d8c4c243c 100644
--- a/js/carousel.js
+++ b/js/carousel.js
@@ -41,6 +41,7 @@
   Carousel.DEFAULTS = {
     interval: 5000
   , pause: 'hover'
+  , wrap: true
   }
 
   Carousel.prototype.cycle =  function (e) {
@@ -105,12 +106,15 @@
     var fallback  = type == 'next' ? 'first' : 'last'
     var that      = this
 
+    if (!$next.length) {
+      if (!this.options.wrap) return
+      $next = this.$element.find('.item')[fallback]()
+    }
+
     this.sliding = true
 
     isCycling && this.pause()
 
-    $next = $next.length ? $next : this.$element.find('.item')[fallback]()
-
     var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction })
 
     if ($next.hasClass('active')) return
-- 
cgit v1.2.3


From 237640c70697ffa0605770dee625d9e3c6abf479 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 12 Aug 2013 23:36:25 -0700
Subject: Drop the accordion for the panel

* Deletes the accordion.less file
* Extends the panel to be collapsible with our JS plugin
* Supports panel color variations
---
 js/collapse.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/collapse.js b/js/collapse.js
index b20022a2e..92cc0bc76 100644
--- a/js/collapse.js
+++ b/js/collapse.js
@@ -48,7 +48,7 @@
     this.$element.trigger(startEvent)
     if (startEvent.isDefaultPrevented()) return
 
-    var actives = this.$parent && this.$parent.find('> .accordion-group > .in')
+    var actives = this.$parent && this.$parent.find('> .panel > .in')
 
     if (actives && actives.length) {
       var hasData = actives.data('bs.collapse')
-- 
cgit v1.2.3