Skip to content

Commit

Permalink
Merge branch 'v4-dev' into v4-navbar-fixed-class
Browse files Browse the repository at this point in the history
  • Loading branch information
@XhmikosR
XhmikosR committed Apr 29, 2020
2 parents ed54ce1 + 748b1b9 commit 72f9c79
Show file tree
Hide file tree
Showing 19 changed files with 309 additions and 339 deletions.
23 changes: 0 additions & 23 deletions .dependabot/config.yml
View file

This file was deleted.

3 changes: 1 addition & 2 deletions .github/workflows/test.yml
View file
Expand Up @@ -56,8 +56,6 @@ jobs:
- run: ruby --version
- run: gem --version
- run: bundle --version
- run: node --version
- run: npm --version
- run: java -version

- name: Install npm dependencies
Expand All @@ -74,6 +72,7 @@ jobs:
if: matrix.node == 10
env:
BUNDLEWATCH_GITHUB_TOKEN: "${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}"
CI_BRANCH_BASE: v4-dev

- name: Run BrowserStack tests
run: npm run js-test-cloud
Expand Down
10 changes: 6 additions & 4 deletions Gemfile.lock
View file
Expand Up @@ -42,7 +42,8 @@ GEM
nokogiri (~> 1.9)
jekyll-watch (2.2.1)
listen (~> 3.0)
kramdown (2.1.0)
kramdown (2.2.1)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
Expand All @@ -61,11 +62,12 @@ GEM
rb-fsevent (0.10.3)
rb-inotify (0.10.1)
ffi (~> 1.0)
rouge (3.17.0)
rexml (3.2.4)
rouge (3.18.0)
safe_yaml (1.0.5)
sassc (2.2.1)
sassc (2.3.0)
ffi (~> 1.9)
sassc (2.2.1-x64-mingw32)
sassc (2.3.0-x64-mingw32)
ffi (~> 1.9)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
Expand Down
4 changes: 2 additions & 2 deletions _config.yml
View file
Expand Up @@ -60,8 +60,8 @@ cdn:
js_hash: "sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6"
js_bundle: "https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.bundle.min.js"
js_bundle_hash: "sha384-6khuMg9gaYr5AxOqhkVIODVIvm9ynTT5J4V1cfthmT+emCG6yVmEZsRHdxlotUnm"
jquery: "https://code.jquery.com/jquery-3.4.1.slim.min.js"
jquery_hash: "sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n"
jquery: "https://code.jquery.com/jquery-3.5.0.slim.min.js"
jquery_hash: "sha384-/IFzzQmt1S744I+IQO4Mc1uphkxbXt1tEwjQ/qSw2p8pXWck09sLvqHmKDYYwReJ"
popper: "https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"
popper_hash: "sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo"

Expand Down
2 changes: 1 addition & 1 deletion js/src/collapse.js
View file
Expand Up @@ -335,7 +335,7 @@ class Collapse {
...typeof config === 'object' && config ? config : {}
}

if (!data && _config.toggle && /show|hide/.test(config)) {
if (!data && _config.toggle && typeof config === 'string' && /show|hide/.test(config)) {
_config.toggle = false
}

Expand Down
34 changes: 17 additions & 17 deletions js/tests/unit/carousel.js
View file
Expand Up @@ -134,13 +134,13 @@ $(function () {
'</ol>' +
'<div class="carousel-inner">' +
'<div class="carousel-item active">' +
'<div class="carousel-caption"/>' +
'<div class="carousel-caption"></div>' +
'</div>' +
'<div class="carousel-item">' +
'<div class="carousel-caption"/>' +
'<div class="carousel-caption"></div>' +
'</div>' +
'<div class="carousel-item">' +
'<div class="carousel-caption"/>' +
'<div class="carousel-caption"></div>' +
'</div>' +
'</div>' +
'<a class="left carousel-control" href="#carousel-example-generic" data-slide="prev"/>' +
Expand Down Expand Up @@ -534,7 +534,7 @@ $(function () {
'<div class="carousel-item active">' +
'<img alt="">' +
'</div>' +
'<script type="text/x-metamorph" id="thingy"/>' +
'<script type="text/x-metamorph" id="thingy"></script>' +
'<div class="carousel-item">' +
'<img alt="">' +
'</div>' +
Expand All @@ -560,7 +560,7 @@ $(function () {
'<div class="carousel-item active">' +
'<img alt="">' +
'</div>' +
'<script type="text/x-metamorph" id="thingy"/>' +
'<script type="text/x-metamorph" id="thingy"></script>' +
'<div class="carousel-item">' +
'<img alt="">' +
'</div>' +
Expand Down Expand Up @@ -763,13 +763,13 @@ $(function () {
'</ol>' +
'<div class="carousel-inner">' +
'<div class="carousel-item active" id="one">' +
'<div class="carousel-caption"/>' +
'<div class="carousel-caption"></div>' +
'</div>' +
'<div class="carousel-item" id="two">' +
'<div class="carousel-caption"/>' +
'<div class="carousel-caption"></div>' +
'</div>' +
'<div class="carousel-item" id="three">' +
'<div class="carousel-caption"/>' +
'<div class="carousel-caption"></div>' +
'</div>' +
'</div>' +
'<a class="left carousel-control" href="#carousel-example-generic" data-slide="prev"/>' +
Expand Down Expand Up @@ -810,13 +810,13 @@ $(function () {
'</ol>' +
'<div class="carousel-inner">' +
'<div class="carousel-item active" id="one">' +
'<div class="carousel-caption"/>' +
'<div class="carousel-caption"></div>' +
'</div>' +
'<div class="carousel-item" id="two">' +
'<div class="carousel-caption"/>' +
'<div class="carousel-caption"></div>' +
'</div>' +
'<div class="carousel-item" id="three">' +
'<div class="carousel-caption"/>' +
'<div class="carousel-caption"></div>' +
'</div>' +
'</div>' +
'<a class="left carousel-control" href="#carousel-example-generic" data-slide="prev"/>' +
Expand Down Expand Up @@ -844,13 +844,13 @@ $(function () {
'</ol>' +
'<div class="carousel-inner">' +
'<div class="carousel-item active" id="one">' +
'<div class="carousel-caption"/>' +
'<div class="carousel-caption"></div>' +
'</div>' +
'<div class="carousel-item" id="two">' +
'<div class="carousel-caption"/>' +
'<div class="carousel-caption"></div>' +
'</div>' +
'<div class="carousel-item" id="three">' +
'<div class="carousel-caption"/>' +
'<div class="carousel-caption"></div>' +
'</div>' +
'</div>' +
'<a class="left carousel-control" href="#carousel-example-generic" data-slide="prev"/>' +
Expand Down Expand Up @@ -892,13 +892,13 @@ $(function () {
'</ol>' +
'<div class="carousel-inner">' +
'<div class="carousel-item active" id="one">' +
'<div class="carousel-caption"/>' +
'<div class="carousel-caption"></div>' +
'</div>' +
'<div class="carousel-item" id="two">' +
'<div class="carousel-caption"/>' +
'<div class="carousel-caption"></div>' +
'</div>' +
'<div class="carousel-item" id="three">' +
'<div class="carousel-caption"/>' +
'<div class="carousel-caption"></div>' +
'</div>' +
'</div>' +
'<a class="left carousel-control" href="#carousel-example-generic" data-slide="prev"/>' +
Expand Down
6 changes: 3 additions & 3 deletions js/tests/unit/dropdown.js
View file
Expand Up @@ -309,7 +309,7 @@ $(function () {
var done = assert.async()
var dropdownHTML = '<div class="nav">' +
'<div class="dropdown" id="testmenu">' +
'<a class="dropdown-toggle" data-toggle="dropdown" href="#testmenu">Test menu <span class="caret"/></a>' +
'<a class="dropdown-toggle" data-toggle="dropdown" href="#testmenu">Test menu</a>' +
'<div class="dropdown-menu">' +
'<a class="dropdown-item" href="#sub1">Submenu 1</a>' +
'</div>' +
Expand Down Expand Up @@ -355,15 +355,15 @@ $(function () {
var done = assert.async()
var dropdownHTML = '<div class="nav">' +
'<div class="dropdown" id="testmenu">' +
'<a class="dropdown-toggle" data-toggle="dropdown" href="#testmenu">Test menu <span class="caret"/></a>' +
'<a class="dropdown-toggle" data-toggle="dropdown" href="#testmenu">Test menu</a>' +
'<div class="dropdown-menu">' +
'<a class="dropdown-item" href="#sub1">Submenu 1</a>' +
'</div>' +
'</div>' +
'</div>' +
'<div class="btn-group">' +
'<button class="btn">Actions</button>' +
'<button class="btn dropdown-toggle" data-toggle="dropdown"><span class="caret"/></button>' +
'<button class="btn dropdown-toggle" data-toggle="dropdown"></button>' +
'<div class="dropdown-menu">' +
'<a class="dropdown-item" href="#">Action 1</a>' +
'</div>' +
Expand Down
18 changes: 9 additions & 9 deletions js/tests/unit/scrollspy.js
View file
Expand Up @@ -509,11 +509,11 @@ $(function () {
$(sectionHTML).appendTo('#qunit-fixture')

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

Expand Down Expand Up @@ -553,10 +553,10 @@ $(function () {
var startOfSectionTwo = 101

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

Expand Down

0 comments on commit 72f9c79

Please sign in to comment.