Skip to content

Commit 72f9c79

Browse files
XhmikosRXhmikosR
authored
Merge branch 'v4-dev' into v4-navbar-fixed-class
2 parents ed54ce1 + 748b1b9 commit 72f9c79

File tree

19 files changed

+309
-339
lines changed

19 files changed

+309
-339
lines changed

‎.dependabot/config.yml

-23
This file was deleted.

‎.github/workflows/test.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ jobs:
5656
- run: ruby --version
5757
- run: gem --version
5858
- run: bundle --version
59-
- run: node --version
60-
- run: npm --version
6159
- run: java -version
6260

6361
- name: Install npm dependencies
@@ -74,6 +72,7 @@ jobs:
7472
if: matrix.node == 10
7573
env:
7674
BUNDLEWATCH_GITHUB_TOKEN: "${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}"
75+
CI_BRANCH_BASE: v4-dev
7776

7877
- name: Run BrowserStack tests
7978
run: npm run js-test-cloud

‎Gemfile.lock

+6-4
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ GEM
4242
nokogiri (~> 1.9)
4343
jekyll-watch (2.2.1)
4444
listen (~> 3.0)
45-
kramdown (2.1.0)
45+
kramdown (2.2.1)
46+
rexml
4647
kramdown-parser-gfm (1.1.0)
4748
kramdown (~> 2.0)
4849
liquid (4.0.3)
@@ -61,11 +62,12 @@ GEM
6162
rb-fsevent (0.10.3)
6263
rb-inotify (0.10.1)
6364
ffi (~> 1.0)
64-
rouge (3.17.0)
65+
rexml (3.2.4)
66+
rouge (3.18.0)
6567
safe_yaml (1.0.5)
66-
sassc (2.2.1)
68+
sassc (2.3.0)
6769
ffi (~> 1.9)
68-
sassc (2.2.1-x64-mingw32)
70+
sassc (2.3.0-x64-mingw32)
6971
ffi (~> 1.9)
7072
terminal-table (1.8.0)
7173
unicode-display_width (~> 1.1, >= 1.1.1)

‎_config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ cdn:
6060
js_hash: "sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6"
6161
js_bundle: "https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.bundle.min.js"
6262
js_bundle_hash: "sha384-6khuMg9gaYr5AxOqhkVIODVIvm9ynTT5J4V1cfthmT+emCG6yVmEZsRHdxlotUnm"
63-
jquery: "https://code.jquery.com/jquery-3.4.1.slim.min.js"
64-
jquery_hash: "sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n"
63+
jquery: "https://code.jquery.com/jquery-3.5.0.slim.min.js"
64+
jquery_hash: "sha384-/IFzzQmt1S744I+IQO4Mc1uphkxbXt1tEwjQ/qSw2p8pXWck09sLvqHmKDYYwReJ"
6565
popper: "https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js"
6666
popper_hash: "sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo"
6767

‎js/src/collapse.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ class Collapse {
335335
...typeof config === 'object' && config ? config : {}
336336
}
337337

338-
if (!data && _config.toggle && /show|hide/.test(config)) {
338+
if (!data && _config.toggle && typeof config === 'string' && /show|hide/.test(config)) {
339339
_config.toggle = false
340340
}
341341

‎js/tests/unit/carousel.js

+17-17
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,13 @@ $(function () {
134134
'</ol>' +
135135
'<div class="carousel-inner">' +
136136
'<div class="carousel-item active">' +
137-
'<div class="carousel-caption"/>' +
137+
'<div class="carousel-caption"></div>' +
138138
'</div>' +
139139
'<div class="carousel-item">' +
140-
'<div class="carousel-caption"/>' +
140+
'<div class="carousel-caption"></div>' +
141141
'</div>' +
142142
'<div class="carousel-item">' +
143-
'<div class="carousel-caption"/>' +
143+
'<div class="carousel-caption"></div>' +
144144
'</div>' +
145145
'</div>' +
146146
'<a class="left carousel-control" href="#carousel-example-generic" data-slide="prev"/>' +
@@ -534,7 +534,7 @@ $(function () {
534534
'<div class="carousel-item active">' +
535535
'<img alt="">' +
536536
'</div>' +
537-
'<script type="text/x-metamorph" id="thingy"/>' +
537+
'<script type="text/x-metamorph" id="thingy"></script>' +
538538
'<div class="carousel-item">' +
539539
'<img alt="">' +
540540
'</div>' +
@@ -560,7 +560,7 @@ $(function () {
560560
'<div class="carousel-item active">' +
561561
'<img alt="">' +
562562
'</div>' +
563-
'<script type="text/x-metamorph" id="thingy"/>' +
563+
'<script type="text/x-metamorph" id="thingy"></script>' +
564564
'<div class="carousel-item">' +
565565
'<img alt="">' +
566566
'</div>' +
@@ -763,13 +763,13 @@ $(function () {
763763
'</ol>' +
764764
'<div class="carousel-inner">' +
765765
'<div class="carousel-item active" id="one">' +
766-
'<div class="carousel-caption"/>' +
766+
'<div class="carousel-caption"></div>' +
767767
'</div>' +
768768
'<div class="carousel-item" id="two">' +
769-
'<div class="carousel-caption"/>' +
769+
'<div class="carousel-caption"></div>' +
770770
'</div>' +
771771
'<div class="carousel-item" id="three">' +
772-
'<div class="carousel-caption"/>' +
772+
'<div class="carousel-caption"></div>' +
773773
'</div>' +
774774
'</div>' +
775775
'<a class="left carousel-control" href="#carousel-example-generic" data-slide="prev"/>' +
@@ -810,13 +810,13 @@ $(function () {
810810
'</ol>' +
811811
'<div class="carousel-inner">' +
812812
'<div class="carousel-item active" id="one">' +
813-
'<div class="carousel-caption"/>' +
813+
'<div class="carousel-caption"></div>' +
814814
'</div>' +
815815
'<div class="carousel-item" id="two">' +
816-
'<div class="carousel-caption"/>' +
816+
'<div class="carousel-caption"></div>' +
817817
'</div>' +
818818
'<div class="carousel-item" id="three">' +
819-
'<div class="carousel-caption"/>' +
819+
'<div class="carousel-caption"></div>' +
820820
'</div>' +
821821
'</div>' +
822822
'<a class="left carousel-control" href="#carousel-example-generic" data-slide="prev"/>' +
@@ -844,13 +844,13 @@ $(function () {
844844
'</ol>' +
845845
'<div class="carousel-inner">' +
846846
'<div class="carousel-item active" id="one">' +
847-
'<div class="carousel-caption"/>' +
847+
'<div class="carousel-caption"></div>' +
848848
'</div>' +
849849
'<div class="carousel-item" id="two">' +
850-
'<div class="carousel-caption"/>' +
850+
'<div class="carousel-caption"></div>' +
851851
'</div>' +
852852
'<div class="carousel-item" id="three">' +
853-
'<div class="carousel-caption"/>' +
853+
'<div class="carousel-caption"></div>' +
854854
'</div>' +
855855
'</div>' +
856856
'<a class="left carousel-control" href="#carousel-example-generic" data-slide="prev"/>' +
@@ -892,13 +892,13 @@ $(function () {
892892
'</ol>' +
893893
'<div class="carousel-inner">' +
894894
'<div class="carousel-item active" id="one">' +
895-
'<div class="carousel-caption"/>' +
895+
'<div class="carousel-caption"></div>' +
896896
'</div>' +
897897
'<div class="carousel-item" id="two">' +
898-
'<div class="carousel-caption"/>' +
898+
'<div class="carousel-caption"></div>' +
899899
'</div>' +
900900
'<div class="carousel-item" id="three">' +
901-
'<div class="carousel-caption"/>' +
901+
'<div class="carousel-caption"></div>' +
902902
'</div>' +
903903
'</div>' +
904904
'<a class="left carousel-control" href="#carousel-example-generic" data-slide="prev"/>' +

‎js/tests/unit/dropdown.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ $(function () {
309309
var done = assert.async()
310310
var dropdownHTML = '<div class="nav">' +
311311
'<div class="dropdown" id="testmenu">' +
312-
'<a class="dropdown-toggle" data-toggle="dropdown" href="#testmenu">Test menu <span class="caret"/></a>' +
312+
'<a class="dropdown-toggle" data-toggle="dropdown" href="#testmenu">Test menu</a>' +
313313
'<div class="dropdown-menu">' +
314314
'<a class="dropdown-item" href="#sub1">Submenu 1</a>' +
315315
'</div>' +
@@ -355,15 +355,15 @@ $(function () {
355355
var done = assert.async()
356356
var dropdownHTML = '<div class="nav">' +
357357
'<div class="dropdown" id="testmenu">' +
358-
'<a class="dropdown-toggle" data-toggle="dropdown" href="#testmenu">Test menu <span class="caret"/></a>' +
358+
'<a class="dropdown-toggle" data-toggle="dropdown" href="#testmenu">Test menu</a>' +
359359
'<div class="dropdown-menu">' +
360360
'<a class="dropdown-item" href="#sub1">Submenu 1</a>' +
361361
'</div>' +
362362
'</div>' +
363363
'</div>' +
364364
'<div class="btn-group">' +
365365
'<button class="btn">Actions</button>' +
366-
'<button class="btn dropdown-toggle" data-toggle="dropdown"><span class="caret"/></button>' +
366+
'<button class="btn dropdown-toggle" data-toggle="dropdown"></button>' +
367367
'<div class="dropdown-menu">' +
368368
'<a class="dropdown-item" href="#">Action 1</a>' +
369369
'</div>' +

‎js/tests/unit/scrollspy.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -509,11 +509,11 @@ $(function () {
509509
$(sectionHTML).appendTo('#qunit-fixture')
510510

511511
var scrollspyHTML = '<div id="content" style="height: 200px; overflow-y: auto;">' +
512-
'<div id="spacer" style="height: 100px;"/>' +
513-
'<div id="one" style="height: 100px;"/>' +
514-
'<div id="two" style="height: 100px;"/>' +
515-
'<div id="three" style="height: 100px;"/>' +
516-
'<div id="spacer" style="height: 100px;"/>' +
512+
'<div id="spacer" style="height: 100px;"></div>' +
513+
'<div id="one" style="height: 100px;"></div>' +
514+
'<div id="two" style="height: 100px;"></div>' +
515+
'<div id="three" style="height: 100px;"></div>' +
516+
'<div id="spacer" style="height: 100px;"></div>' +
517517
'</div>'
518518
var $scrollspy = $(scrollspyHTML).appendTo('#qunit-fixture')
519519

@@ -553,10 +553,10 @@ $(function () {
553553
var startOfSectionTwo = 101
554554

555555
var scrollspyHTML = '<div id="content" style="height: 200px; overflow-y: auto;">' +
556-
'<div id="one" style="height: 100px;"/>' +
557-
'<div id="two" style="height: 100px;"/>' +
558-
'<div id="three" style="height: 100px;"/>' +
559-
'<div id="spacer" style="height: 100px;"/>' +
556+
'<div id="one" style="height: 100px;"></div>' +
557+
'<div id="two" style="height: 100px;"></div>' +
558+
'<div id="three" style="height: 100px;"></div>' +
559+
'<div id="spacer" style="height: 100px;"></div>' +
560560
'</div>'
561561
var $scrollspy = $(scrollspyHTML).appendTo('#qunit-fixture')
562562

0 commit comments

Comments
 (0)