From 3b2418e6885d31d9cd1eab33b4cb952e876f8cf7 Mon Sep 17 00:00:00 2001
From: fat <jacobthornton@gmail.com>
Date: Thu, 16 Jan 2014 13:44:08 -0800
Subject: remove flaky pos bottom test which is effect by unit scroll pos

---
 dist/js/bootstrap.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'dist/js/bootstrap.js')

diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js
index 9896669bc..09b81b32c 100644
--- a/dist/js/bootstrap.js
+++ b/dist/js/bootstrap.js
@@ -322,7 +322,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
   Carousel.prototype.pause = function (e) {
     e || (this.paused = true)
 
-    if (this.$element.find('.next, .prev').length && $.support.transition.end) {
+    if (this.$element.find('.next, .prev').length && $.support.transition) {
       this.$element.trigger($.support.transition.end)
       this.cycle(true)
     }
@@ -587,6 +587,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
       var data    = $this.data('bs.collapse')
       var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
 
+      if (!data && options.toggle && option == 'show') option = !option
       if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
       if (typeof option == 'string') data[option]()
     })
-- 
cgit v1.2.3


From 7fab3c30f225bd5b1f362575c684388041199fbd Mon Sep 17 00:00:00 2001
From: Tobias Lindig <tl@cm4all.com>
Date: Fri, 17 Jan 2014 13:34:03 +0100
Subject: remove needless space character

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

(limited to 'dist/js/bootstrap.js')

diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js
index 09b81b32c..7a734f769 100644
--- a/dist/js/bootstrap.js
+++ b/dist/js/bootstrap.js
@@ -1016,7 +1016,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
   })
 
   $(document)
-    .on('show.bs.modal',  '.modal', function () { $(document.body).addClass('modal-open') })
+    .on('show.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') })
     .on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') })
 
 }(jQuery);
-- 
cgit v1.2.3


From 084f0fb11351e899decc33faf53ada85d29ea7fa Mon Sep 17 00:00:00 2001
From: Tobias Lindig <tl@cm4all.com>
Date: Fri, 17 Jan 2014 13:21:57 +0100
Subject: add namespace `.bs` also to the event `dismiss.modal`

---
 dist/js/bootstrap.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'dist/js/bootstrap.js')

diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js
index 7a734f769..e9c545658 100644
--- a/dist/js/bootstrap.js
+++ b/dist/js/bootstrap.js
@@ -829,7 +829,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
 
     this.escape()
 
-    this.$element.on('click.dismiss.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
+    this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
 
     this.backdrop(function () {
       var transition = $.support.transition && that.$element.hasClass('fade')
@@ -882,7 +882,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
     this.$element
       .removeClass('in')
       .attr('aria-hidden', true)
-      .off('click.dismiss.modal')
+      .off('click.dismiss.bs.modal')
 
     $.support.transition && this.$element.hasClass('fade') ?
       this.$element
@@ -934,7 +934,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
       this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
         .appendTo(document.body)
 
-      this.$element.on('click.dismiss.modal', $.proxy(function (e) {
+      this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) {
         if (e.target !== e.currentTarget) return
         this.options.backdrop == 'static'
           ? this.$element[0].focus.call(this.$element[0])
-- 
cgit v1.2.3