Merge branch 'master' into v4

Conflicts:
	Gruntfile.js
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.min.js
	docs/_data/glyphicons.yml
	docs/_includes/components/alerts.html
	docs/_includes/components/badges.html
	docs/_includes/components/breadcrumbs.html
	docs/_includes/components/button-dropdowns.html
	docs/_includes/components/button-groups.html
	docs/_includes/components/dropdowns.html
	docs/_includes/components/glyphicons.html
	docs/_includes/components/input-groups.html
	docs/_includes/components/jumbotron.html
	docs/_includes/components/labels.html
	docs/_includes/components/list-group.html
	docs/_includes/components/media.html
	docs/_includes/components/navbar.html
	docs/_includes/components/navs.html
	docs/_includes/components/page-header.html
	docs/_includes/components/pagination.html
	docs/_includes/components/panels.html
	docs/_includes/components/progress-bars.html
	docs/_includes/components/responsive-embed.html
	docs/_includes/components/thumbnails.html
	docs/_includes/components/wells.html
	docs/_includes/css/buttons.html
	docs/_includes/css/code.html
	docs/_includes/css/forms.html
	docs/_includes/css/grid.html
	docs/_includes/css/helpers.html
	docs/_includes/css/images.html
	docs/_includes/css/less.html
	docs/_includes/css/tables.html
	docs/_includes/css/type.html
	docs/_includes/customizer-variables.html
	docs/_includes/getting-started/accessibility.html
	docs/_includes/getting-started/disabling-responsiveness.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/whats-included.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/modal.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tabs.html
	docs/_includes/js/tooltips.html
	docs/_includes/nav/components.html
	docs/_includes/nav/javascript.html
	docs/_jade/customizer-variables.jade
	docs/_layouts/default.html
	docs/about.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/src/customizer.js
	docs/customize.html
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	less/glyphicons.less
	less/mixins/vendor-prefixes.less
	less/navbar.less
	less/popovers.less
	less/tables.less
	less/theme.less
	less/tooltip.less
	less/variables.less
	package.json
	scss/_carousel.scss
	scss/_close.scss
	scss/_forms.scss
	test-infra/npm-shrinkwrap.json

14 files changed, 51 insertions, 86 deletions

diff --git a/js/affix.js b/js/affix.js
index 04f389e2c..1f067342c 100644
--- a/js/affix.js
+++ b/js/affix.js
@@ -2,7 +2,7 @@
  * Bootstrap: affix.js v3.3.1
  * http://getbootstrap.com/javascript/#affix
  * ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2015 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
diff --git a/js/alert.js b/js/alert.js
index 7b775dd0a..1ba3a44e1 100644
--- a/js/alert.js
+++ b/js/alert.js
@@ -2,7 +2,7 @@
  * Bootstrap: alert.js v3.3.1
  * http://getbootstrap.com/javascript/#alerts
  * ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2015 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
diff --git a/js/button.js b/js/button.js
index 7b1e134b2..2d71f350b 100644
--- a/js/button.js
+++ b/js/button.js
@@ -2,7 +2,7 @@
  * Bootstrap: button.js v3.3.1
  * http://getbootstrap.com/javascript/#buttons
  * ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2015 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
diff --git a/js/carousel.js b/js/carousel.js
index 1e8215c8b..7882bc54b 100644
--- a/js/carousel.js
+++ b/js/carousel.js
@@ -2,7 +2,7 @@
  * Bootstrap: carousel.js v3.3.1
  * http://getbootstrap.com/javascript/#carousel
  * ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2015 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
diff --git a/js/collapse.js b/js/collapse.js
index a2ede5914..8ffa1e708 100644
--- a/js/collapse.js
+++ b/js/collapse.js
@@ -2,7 +2,7 @@
  * Bootstrap: collapse.js v3.3.1
  * http://getbootstrap.com/javascript/#collapse
  * ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2015 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
diff --git a/js/dropdown.js b/js/dropdown.js
index 69a40f681..980424d63 100644
--- a/js/dropdown.js
+++ b/js/dropdown.js
@@ -2,7 +2,7 @@
  * Bootstrap: dropdown.js v3.3.1
  * http://getbootstrap.com/javascript/#dropdowns
  * ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2015 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
diff --git a/js/modal.js b/js/modal.js
index 93891aa4e..6be32fcd8 100644
--- a/js/modal.js
+++ b/js/modal.js
@@ -2,7 +2,7 @@
  * Bootstrap: modal.js v3.3.1
  * http://getbootstrap.com/javascript/#modals
  * ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2015 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
diff --git a/js/popover.js b/js/popover.js
index 085584fe8..cf2c7508c 100644
--- a/js/popover.js
+++ b/js/popover.js
@@ -2,7 +2,7 @@
  * Bootstrap: popover.js v3.3.1
  * http://getbootstrap.com/javascript/#popovers
  * ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2015 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
@@ -86,18 +86,12 @@
 
   function Plugin(option) {
     return this.each(function () {
-      var $this    = $(this)
-      var data     = $this.data('bs.popover')
-      var options  = typeof option == 'object' && option
-      var selector = options && options.selector
+      var $this   = $(this)
+      var data    = $this.data('bs.popover')
+      var options = typeof option == 'object' && option
 
       if (!data && option == 'destroy') return
-      if (selector) {
-        if (!data) $this.data('bs.popover', (data = {}))
-        if (!data[selector]) data[selector] = new Popover(this, options)
-      } else {
-        if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
-      }
+      if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
       if (typeof option == 'string') data[option]()
     })
   }
diff --git a/js/scrollspy.js b/js/scrollspy.js
index c468262f3..20a3e4060 100644
--- a/js/scrollspy.js
+++ b/js/scrollspy.js
@@ -2,7 +2,7 @@
  * Bootstrap: scrollspy.js v3.3.1
  * http://getbootstrap.com/javascript/#scrollspy
  * ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2015 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
diff --git a/js/tab.js b/js/tab.js
index d59827f2e..01f233634 100644
--- a/js/tab.js
+++ b/js/tab.js
@@ -2,7 +2,7 @@
  * Bootstrap: tab.js v3.3.1
  * http://getbootstrap.com/javascript/#tabs
  * ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2015 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
diff --git a/js/tests/unit/popover.js b/js/tests/unit/popover.js
index 8f59d3483..729ba46b7 100644
--- a/js/tests/unit/popover.js
+++ b/js/tests/unit/popover.js
@@ -188,33 +188,41 @@ $(function () {
     equal($('.popover').length, 0, 'popover was removed')
   })
 
-  test('should render popover elements using different delegated selectors on the same node', function () {
-    var popoverHTML = '<div>'
-        + '<a href="#" class="first" title="mdo" data-content="http://twitter.com/mdo">@mdo</a>'
-        + '<a href="#" class="second" title="mdo" data-content="http://twitter.com/mdo">@mdo</a>'
-        + '</div>'
+  test('should detach popover content rather than removing it so that event handlers are left intact', function () {
+    var $content = $('<div class="content-with-handler"><a class="btn btn-warning">Button with event handler</a></div>').appendTo('#qunit-fixture')
 
-    var $div = $(popoverHTML)
+    var handlerCalled = false
+    $('.content-with-handler .btn').click(function () {
+      handlerCalled = true
+    })
+
+    var $div = $('<div><a href="#">Show popover</a></div>')
       .appendTo('#qunit-fixture')
       .bootstrapPopover({
-        selector: 'a.first',
-        trigger: 'click'
-      })
-      .bootstrapPopover({
-        selector: 'a.second',
-        trigger: 'click'
+        html: true,
+        trigger: 'manual',
+        container: 'body',
+        content: function () {
+          return $content
+        }
       })
 
-    $div.find('a.first').click()
-    notEqual($('.popover').length, 0, 'first popover was inserted')
-
-    $div.find('a.first').click()
-    equal($('.popover').length, 0, 'first popover removed')
-
-    $div.find('a.second').click()
-    notEqual($('.popover').length, 0, 'second popover was inserted')
-
-    $div.find('a.second').click()
-    equal($('.popover').length, 0, 'second popover removed')
+    stop()
+    $div
+      .one('shown.bs.popover', function () {
+        $div
+          .one('hidden.bs.popover', function () {
+            $div
+              .one('shown.bs.popover', function () {
+                $('.content-with-handler .btn').click()
+                $div.bootstrapPopover('destroy')
+                ok(handlerCalled, 'content\'s event handler still present')
+                start()
+              })
+              .bootstrapPopover('show')
+          })
+          .bootstrapPopover('hide')
+      })
+      .bootstrapPopover('show')
   })
 })
diff --git a/js/tests/unit/tooltip.js b/js/tests/unit/tooltip.js
index 6232ccdcb..8bde0f533 100644
--- a/js/tests/unit/tooltip.js
+++ b/js/tests/unit/tooltip.js
@@ -235,37 +235,6 @@ $(function () {
     equal($('.tooltip').length, 0, 'tooltip was removed from dom')
   })
 
-  test('should show tooltips with different delegate selectors on the same node on click', function () {
-    var tooltipHTML = '<div>'
-        + '<a href="#" class="first" rel="tooltip" title="First delegated tooltip"/>'
-        + '<a href="#" class="second" rel="tooltip" title="Second delegated tooltip"/>'
-        + '</div>'
-
-    var $div = $(tooltipHTML)
-      .append()
-      .appendTo('#qunit-fixture')
-      .bootstrapTooltip({
-        selector: 'a.first[rel="tooltip"]',
-        trigger: 'click'
-      })
-      .bootstrapTooltip({
-        selector: 'a.second[rel="tooltip"]',
-        trigger: 'click'
-      })
-
-    $div.find('a.first').click()
-    ok($('.tooltip').is('.fade.in'), 'first tooltip is faded in')
-
-    $div.find('a.first').click()
-    equal($('.tooltip').length, 0, 'first tooltip was removed from dom')
-
-    $div.find('a.second').click()
-    ok($('.tooltip').is('.fade.in'), 'second tooltip is faded in')
-
-    $div.find('a.second').click()
-    equal($('.tooltip').length, 0, 'second tooltip was removed from dom')
-  })
-
   test('should show tooltip when toggle is called', function () {
     $('<a href="#" rel="tooltip" title="tooltip on toggle"/>')
       .appendTo('#qunit-fixture')
diff --git a/js/tooltip.js b/js/tooltip.js
index 9d3074cc0..204a2ff02 100644
--- a/js/tooltip.js
+++ b/js/tooltip.js
@@ -3,7 +3,7 @@
  * http://getbootstrap.com/javascript/#tooltip
  * Inspired by the original jQuery.tipsy by Jason Frame
  * ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2015 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
@@ -445,18 +445,12 @@
 
   function Plugin(option) {
     return this.each(function () {
-      var $this    = $(this)
-      var data     = $this.data('bs.tooltip')
-      var options  = typeof option == 'object' && option
-      var selector = options && options.selector
+      var $this   = $(this)
+      var data    = $this.data('bs.tooltip')
+      var options = typeof option == 'object' && option
 
       if (!data && option == 'destroy') return
-      if (selector) {
-        if (!data) $this.data('bs.tooltip', (data = {}))
-        if (!data[selector]) data[selector] = new Tooltip(this, options)
-      } else {
-        if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
-      }
+      if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
       if (typeof option == 'string') data[option]()
     })
   }
diff --git a/js/transition.js b/js/transition.js
index 68c2bd60b..1853b5f2e 100644
--- a/js/transition.js
+++ b/js/transition.js
@@ -2,7 +2,7 @@
  * Bootstrap: transition.js v3.3.1
  * http://getbootstrap.com/javascript/#transitions
  * ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2015 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */