8000 Run `grunt`. · liuwenye2010/bootstrap@eea6690 · GitHub
[go: up one dir, main page]
Skip to content

Commit eea6690

Browse files
XhmikosRXhmikosR
committed
Run grunt.
[ci skip]
1 parent 1b645ef commit eea6690

17 files changed

+412
-828
lines changed

‎dist/css/bootstrap.css

Lines changed: 187 additions & 403 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/bootstrap.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/bootstrap.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/bootstrap.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/js/bootstrap.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ if (typeof jQuery === 'undefined') {
1010

1111
+function ($) {
1212
var version = $.fn.jquery.split(' ')[0].split('.')
13-
if (version[0] !== '2') {
14-
throw new Error('Bootstrap\'s JavaScript requires jQuery version 2.x.x')
13+
if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] >= 3)) {
14+
throw new Error('Bootstrap\'s JavaScript requires at least jQuery v1.9.1 but less than v3.0.0')
1515
}
1616
}(jQuery);
1717

@@ -2768,8 +2768,8 @@ var Tooltip = (function ($) {
27682768
* Check for Tether dependency
27692769
* Tether - http://github.hubspot.com/tether/
27702770
*/
2771-
if (!window.Tether) {
2772-
throw new Error("Bootstrap tooltips require Tether (http://github.hubspot.com/tether/)");
2771+
if (window.Tether === undefined) {
2772+
throw new Error('Bootstrap tooltips require Tether (http://github.hubspot.com/tether/)');
27732773
}
27742774

27752775
/**

‎dist/js/bootstrap.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/js/umd/tooltip.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
* Check for Tether dependency
3737
* Tether - http://github.hubspot.com/tether/
3838
*/
39-
if (!window.Tether) {
40-
throw new Error("Bootstrap tooltips require Tether (http://github.hubspot.com/tether/)");
39+
if (window.Tether === undefined) {
40+
throw new Error('Bootstrap tooltips require Tether (http://github.hubspot.com/tether/)');
4141
}
4242

4343
/**

‎docs/assets/css/docs.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
0