Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap-rubygem.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGleb Mazovetskiy <glex.spb@gmail.com>2016-01-19 11:50:08 +0300
committerGleb Mazovetskiy <glex.spb@gmail.com>2016-01-19 11:50:08 +0300
commit2642b162208bacefa24e6d52a576546392289f46 (patch)
treeb65ee830976596974e99ba39239c39a1a4f644ab /assets/javascripts/bootstrap
parentb6f12ed698f3a57db519eb7e171b181100b0541a (diff)
rake update[v4-dev]
Diffstat (limited to 'assets/javascripts/bootstrap')
-rw-r--r--assets/javascripts/bootstrap/alert.js2
-rw-r--r--assets/javascripts/bootstrap/button.js2
-rw-r--r--assets/javascripts/bootstrap/carousel.js2
-rw-r--r--assets/javascripts/bootstrap/collapse.js2
-rw-r--r--assets/javascripts/bootstrap/dropdown.js4
-rw-r--r--assets/javascripts/bootstrap/modal.js4
-rw-r--r--assets/javascripts/bootstrap/popover.js2
-rw-r--r--assets/javascripts/bootstrap/scrollspy.js2
-rw-r--r--assets/javascripts/bootstrap/tab.js2
-rw-r--r--assets/javascripts/bootstrap/tooltip.js2
-rw-r--r--assets/javascripts/bootstrap/util.js2
11 files changed, 14 insertions, 12 deletions
diff --git a/assets/javascripts/bootstrap/alert.js b/assets/javascripts/bootstrap/alert.js
index 442b067..15442c1 100644
--- a/assets/javascripts/bootstrap/alert.js
+++ b/assets/javascripts/bootstrap/alert.js
@@ -20,7 +20,7 @@ var Alert = (function ($) {
*/
var NAME = 'alert';
- var VERSION = '4.0.0-alpha';
+ var VERSION = '4.0.0-alpha.2';
var DATA_KEY = 'bs.alert';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
diff --git a/assets/javascripts/bootstrap/button.js b/assets/javascripts/bootstrap/button.js
index 36a9d60..38dc6b7 100644
--- a/assets/javascripts/bootstrap/button.js
+++ b/assets/javascripts/bootstrap/button.js
@@ -20,7 +20,7 @@ var Button = (function ($) {
*/
var NAME = 'button';
- var VERSION = '4.0.0-alpha';
+ var VERSION = '4.0.0-alpha.2';
var DATA_KEY = 'bs.button';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
diff --git a/assets/javascripts/bootstrap/carousel.js b/assets/javascripts/bootstrap/carousel.js
index 7e1e9ac..d669a50 100644
--- a/assets/javascripts/bootstrap/carousel.js
+++ b/assets/javascripts/bootstrap/carousel.js
@@ -20,7 +20,7 @@ var Carousel = (function ($) {
*/
var NAME = 'carousel';
- var VERSION = '4.0.0-alpha';
+ var VERSION = '4.0.0-alpha.2';
var DATA_KEY = 'bs.carousel';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
diff --git a/assets/javascripts/bootstrap/collapse.js b/assets/javascripts/bootstrap/collapse.js
index 5b7cc62..ff7842c 100644
--- a/assets/javascripts/bootstrap/collapse.js
+++ b/assets/javascripts/bootstrap/collapse.js
@@ -20,7 +20,7 @@ var Collapse = (function ($) {
*/
var NAME = 'collapse';
- var VERSION = '4.0.0-alpha';
+ var VERSION = '4.0.0-alpha.2';
var DATA_KEY = 'bs.collapse';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
diff --git a/assets/javascripts/bootstrap/dropdown.js b/assets/javascripts/bootstrap/dropdown.js
index 64269c8..d42268a 100644
--- a/assets/javascripts/bootstrap/dropdown.js
+++ b/assets/javascripts/bootstrap/dropdown.js
@@ -20,7 +20,7 @@ var Dropdown = (function ($) {
*/
var NAME = 'dropdown';
- var VERSION = '4.0.0-alpha';
+ var VERSION = '4.0.0-alpha.2';
var DATA_KEY = 'bs.dropdown';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
@@ -255,7 +255,7 @@ var Dropdown = (function ($) {
index++;
}
- if (! ~index) {
+ if (index < 0) {
index = 0;
}
diff --git a/assets/javascripts/bootstrap/modal.js b/assets/javascripts/bootstrap/modal.js
index 51e07d0..26cac98 100644
--- a/assets/javascripts/bootstrap/modal.js
+++ b/assets/javascripts/bootstrap/modal.js
@@ -20,7 +20,7 @@ var Modal = (function ($) {
*/
var NAME = 'modal';
- var VERSION = '4.0.0-alpha';
+ var VERSION = '4.0.0-alpha.2';
var DATA_KEY = 'bs.modal';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
@@ -258,7 +258,7 @@ var Modal = (function ($) {
$(document).off(Event.FOCUSIN) // guard against infinite focus loop
.on(Event.FOCUSIN, function (event) {
- if (_this3._element !== event.target && !$(_this3._element).has(event.target).length) {
+ if (document !== event.target && _this3._element !== event.target && !$(_this3._element).has(event.target).length) {
_this3._element.focus();
}
});
diff --git a/assets/javascripts/bootstrap/popover.js b/assets/javascripts/bootstrap/popover.js
index 8799905..e46a268 100644
--- a/assets/javascripts/bootstrap/popover.js
+++ b/assets/javascripts/bootstrap/popover.js
@@ -24,7 +24,7 @@ var Popover = (function ($) {
*/
var NAME = 'popover';
- var VERSION = '4.0.0-alpha';
+ var VERSION = '4.0.0-alpha.2';
var DATA_KEY = 'bs.popover';
var EVENT_KEY = '.' + DATA_KEY;
var JQUERY_NO_CONFLICT = $.fn[NAME];
diff --git a/assets/javascripts/bootstrap/scrollspy.js b/assets/javascripts/bootstrap/scrollspy.js
index 051285f..0567e60 100644
--- a/assets/javascripts/bootstrap/scrollspy.js
+++ b/assets/javascripts/bootstrap/scrollspy.js
@@ -20,7 +20,7 @@ var ScrollSpy = (function ($) {
*/
var NAME = 'scrollspy';
- var VERSION = '4.0.0-alpha';
+ var VERSION = '4.0.0-alpha.2';
var DATA_KEY = 'bs.scrollspy';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
diff --git a/assets/javascripts/bootstrap/tab.js b/assets/javascripts/bootstrap/tab.js
index eea6842..60cd805 100644
--- a/assets/javascripts/bootstrap/tab.js
+++ b/assets/javascripts/bootstrap/tab.js
@@ -20,7 +20,7 @@ var Tab = (function ($) {
*/
var NAME = 'tab';
- var VERSION = '4.0.0-alpha';
+ var VERSION = '4.0.0-alpha.2';
var DATA_KEY = 'bs.tab';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
diff --git a/assets/javascripts/bootstrap/tooltip.js b/assets/javascripts/bootstrap/tooltip.js
index 98bc4d4..e46a7e5 100644
--- a/assets/javascripts/bootstrap/tooltip.js
+++ b/assets/javascripts/bootstrap/tooltip.js
@@ -30,7 +30,7 @@ var Tooltip = (function ($) {
*/
var NAME = 'tooltip';
- var VERSION = '4.0.0-alpha';
+ var VERSION = '4.0.0-alpha.2';
var DATA_KEY = 'bs.tooltip';
var EVENT_KEY = '.' + DATA_KEY;
var JQUERY_NO_CONFLICT = $.fn[NAME];
diff --git a/assets/javascripts/bootstrap/util.js b/assets/javascripts/bootstrap/util.js
index a307e80..c8da76b 100644
--- a/assets/javascripts/bootstrap/util.js
+++ b/assets/javascripts/bootstrap/util.js
@@ -101,7 +101,9 @@ var Util = (function ($) {
getUID: function getUID(prefix) {
do {
+ /* eslint-disable no-bitwise */
prefix += ~ ~(Math.random() * 1000000); // "~~" acts like a faster Math.floor() here
+ /* eslint-enable no-bitwise */
} while (document.getElementById(prefix));
return prefix;
},