Merge branch 'master' of github.com:twbs/bootstrap

11 files changed, 23 insertions, 1 deletions

diff --git a/js/affix.js b/js/affix.js
index 270b039bf..fc91936fb 100644
--- a/js/affix.js
+++ b/js/affix.js
@@ -27,7 +27,9 @@
     this.checkPosition()
   }
 
-  Affix.RESET = 'affix affix-top affix-bottom'
+  Affix.VERSION  = '3.1.1'
+
+  Affix.RESET    = 'affix affix-top affix-bottom'
 
   Affix.DEFAULTS = {
     offset: 0
diff --git a/js/alert.js b/js/alert.js
index ee2bd02e1..905aacc15 100644
--- a/js/alert.js
+++ b/js/alert.js
@@ -18,6 +18,8 @@
     $(el).on('click', dismiss, this.close)
   }
 
+  Alert.VERSION = '3.1.1'
+
   Alert.prototype.close = function (e) {
     var $this    = $(this)
     var selector = $this.attr('data-target')
diff --git a/js/button.js b/js/button.js
index bbce6690e..aa7145072 100644
--- a/js/button.js
+++ b/js/button.js
@@ -19,6 +19,8 @@
     this.isLoading = false
   }
 
+  Button.VERSION  = '3.1.1'
+
   Button.DEFAULTS = {
     loadingText: 'loading...'
   }
diff --git a/js/carousel.js b/js/carousel.js
index 2beae55e1..2a94a9838 100644
--- a/js/carousel.js
+++ b/js/carousel.js
@@ -28,6 +28,8 @@
       .on('mouseleave', $.proxy(this.cycle, this))
   }
 
+  Carousel.VERSION  = '3.1.1'
+
   Carousel.DEFAULTS = {
     interval: 5000,
     pause: 'hover',
diff --git a/js/collapse.js b/js/collapse.js
index 4ff5544c5..8d6e33289 100644
--- a/js/collapse.js
+++ b/js/collapse.js
@@ -22,6 +22,8 @@
     if (this.options.toggle) this.toggle()
   }
 
+  Collapse.VERSION  = '3.1.1'
+
   Collapse.DEFAULTS = {
     toggle: true
   }
diff --git a/js/dropdown.js b/js/dropdown.js
index 1c24858dd..bc671fef0 100644
--- a/js/dropdown.js
+++ b/js/dropdown.js
@@ -19,6 +19,8 @@
     $(element).on('click.bs.dropdown', this.toggle)
   }
 
+  Dropdown.VERSION = '3.1.1'
+
   Dropdown.prototype.toggle = function (e) {
     var $this = $(this)
 
diff --git a/js/modal.js b/js/modal.js
index ae1b8e598..109f66d7d 100644
--- a/js/modal.js
+++ b/js/modal.js
@@ -30,6 +30,8 @@
     }
   }
 
+  Modal.VERSION  = '3.1.1'
+
   Modal.DEFAULTS = {
     backdrop: true,
     keyboard: true,
diff --git a/js/popover.js b/js/popover.js
index 9fff89320..ea76720b8 100644
--- a/js/popover.js
+++ b/js/popover.js
@@ -19,6 +19,8 @@
 
   if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
 
+  Popover.VERSION  = '3.1.1'
+
   Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
     placement: 'right',
     trigger: 'click',
diff --git a/js/scrollspy.js b/js/scrollspy.js
index 4ba733e78..74e016dc9 100644
--- a/js/scrollspy.js
+++ b/js/scrollspy.js
@@ -32,6 +32,8 @@
     this.process()
   }
 
+  ScrollSpy.VERSION  = '3.1.1'
+
   ScrollSpy.DEFAULTS = {
     offset: 10
   }
diff --git a/js/tab.js b/js/tab.js
index 5a6b6a331..0078453c5 100644
--- a/js/tab.js
+++ b/js/tab.js
@@ -17,6 +17,8 @@
     this.element = $(element)
   }
 
+  Tab.VERSION = '3.1.1'
+
   Tab.prototype.show = function () {
     var $this    = this.element
     var $ul      = $this.closest('ul:not(.dropdown-menu)')
diff --git a/js/tooltip.js b/js/tooltip.js
index f688b3020..d985f96e3 100644
--- a/js/tooltip.js
+++ b/js/tooltip.js
@@ -25,6 +25,8 @@
     this.init('tooltip', element, options)
   }
 
+  Tooltip.VERSION  = '3.1.1'
+
   Tooltip.DEFAULTS = {
     animation: true,
     placement: 'top',