Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
d848c322
Commit
d848c322
authored
4 years ago
by
XhmikosR
Browse files
Options
Download
Email Patches
Plain Diff
Fix tests for jQuery v3.5.0.
parent
05cfefd3
v4-dev-dropdown-hide-method
v4-dev
v4.6.2
v4.6.1
v4.6.0
v4.5.3
v4.5.2
v4.5.1
v4.5.0
6 merge requests
!36532
My v4 dev
,
!34086
v4: Fix prevented show event disables modals with fade class from being displayed again
,
!33729
V4 dev
,
!33086
V4 dev
,
!31901
Add opacity utilities
,
!31513
Update icons.md
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
js/tests/unit/carousel.js
+17
-17
js/tests/unit/carousel.js
js/tests/unit/scrollspy.js
+9
-9
js/tests/unit/scrollspy.js
with
26 additions
and
26 deletions
+26
-26
js/tests/unit/carousel.js
+
17
-
17
View file @
d848c322
...
...
@@ -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"/>
'
+
...
...
@@ -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>
'
+
...
...
@@ -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>
'
+
...
...
@@ -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"/>
'
+
...
...
@@ -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"/>
'
+
...
...
@@ -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"/>
'
+
...
...
@@ -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"/>
'
+
...
...
This diff is collapsed.
Click to expand it.
js/tests/unit/scrollspy.js
+
9
-
9
View file @
d848c322
...
...
@@ -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
'
)
...
...
@@ -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
'
)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets