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
e2cabe49
Commit
e2cabe49
authored
10 years ago
by
XhmikosR
Browse files
Options
Download
Email Patches
Plain Diff
Minor style tweaks.
parent
82fc03f3
5 merge requests
!28721
Hot test
,
!16605
Test pull please ignore
,
!22103
test
,
!25326
Adjust examples
,
!13388
Improve JS style
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
docs/assets/js/_src/customizer.js
+2
-4
docs/assets/js/_src/customizer.js
js/affix.js
+3
-1
js/affix.js
js/carousel.js
+8
-3
js/carousel.js
js/modal.js
+1
-1
js/modal.js
js/tests/unit/affix.js
+3
-1
js/tests/unit/affix.js
js/tests/unit/popover.js
+3
-1
js/tests/unit/popover.js
js/tests/unit/tooltip.js
+9
-8
js/tests/unit/tooltip.js
js/tooltip.js
+1
-1
js/tooltip.js
with
30 additions
and
20 deletions
+30
-20
docs/assets/js/_src/customizer.js
+
2
-
4
View file @
e2cabe49
...
...
@@ -80,8 +80,7 @@ window.onload = function () { // wait for load in a dumb way because B-0
.
error
(
function
(
err
)
{
try
{
showError
(
'
<strong>Ruh roh!</strong> Could not save gist file, configuration not saved.
'
,
err
)
}
catch
(
sameErr
)
{
}
catch
(
sameErr
)
{
// deliberately ignore the error
}
callback
(
'
<none>
'
,
'
<none>
'
)
...
...
@@ -416,8 +415,7 @@ window.onload = function () { // wait for load in a dumb way because B-0
// than "blob:", which means it has been polyfilled and is not supported by
// this browser.
failback
()
}
else
{
}
else
{
$
(
'
<img>
'
)
.
on
(
'
load
'
,
function
()
{
$compileBtn
.
prop
(
'
disabled
'
,
false
)
...
...
This diff is collapsed.
Click to expand it.
js/affix.js
+
3
-
1
View file @
e2cabe49
...
...
@@ -86,7 +86,9 @@
.
trigger
(
$
.
Event
(
affixType
.
replace
(
'
affix
'
,
'
affixed
'
)))
if
(
affix
==
'
bottom
'
)
{
this
.
$element
.
offset
({
top
:
scrollHeight
-
this
.
$element
.
height
()
-
offsetBottom
})
this
.
$element
.
offset
({
top
:
scrollHeight
-
this
.
$element
.
height
()
-
offsetBottom
})
}
}
...
...
This diff is collapsed.
Click to expand it.
js/carousel.js
+
8
-
3
View file @
e2cabe49
...
...
@@ -36,7 +36,7 @@
wrap
:
true
}
Carousel
.
prototype
.
cycle
=
function
(
e
)
{
Carousel
.
prototype
.
cycle
=
function
(
e
)
{
e
||
(
this
.
paused
=
false
)
this
.
interval
&&
clearInterval
(
this
.
interval
)
...
...
@@ -106,7 +106,10 @@
if
(
$next
.
hasClass
(
'
active
'
))
return
(
this
.
sliding
=
false
)
var
relatedTarget
=
$next
[
0
]
var
slideEvent
=
$
.
Event
(
'
slide.bs.carousel
'
,
{
relatedTarget
:
relatedTarget
,
direction
:
direction
})
var
slideEvent
=
$
.
Event
(
'
slide.bs.carousel
'
,
{
relatedTarget
:
relatedTarget
,
direction
:
direction
})
this
.
$element
.
trigger
(
slideEvent
)
if
(
slideEvent
.
isDefaultPrevented
())
return
...
...
@@ -133,7 +136,9 @@
$next
.
removeClass
([
type
,
direction
].
join
(
'
'
)).
addClass
(
'
active
'
)
$active
.
removeClass
([
'
active
'
,
direction
].
join
(
'
'
))
that
.
sliding
=
false
setTimeout
(
function
()
{
that
.
$element
.
trigger
(
slidEvent
)
},
0
)
setTimeout
(
function
()
{
that
.
$element
.
trigger
(
slidEvent
)
},
0
)
})
.
emulateTransitionEnd
(
$active
.
css
(
'
transition-duration
'
).
slice
(
0
,
-
1
)
*
1000
)
}
else
{
...
...
This diff is collapsed.
Click to expand it.
js/modal.js
+
1
-
1
View file @
e2cabe49
...
...
@@ -208,7 +208,7 @@
this
.
scrollbarWidth
=
this
.
scrollbarWidth
||
this
.
measureScrollbar
()
}
Modal
.
prototype
.
setScrollbar
=
function
()
{
Modal
.
prototype
.
setScrollbar
=
function
()
{
var
bodyPad
=
parseInt
((
this
.
$body
.
css
(
'
padding-right
'
)
||
0
),
10
)
if
(
this
.
scrollbarWidth
)
this
.
$body
.
css
(
'
padding-right
'
,
bodyPad
+
this
.
scrollbarWidth
)
}
...
...
This diff is collapsed.
Click to expand it.
js/tests/unit/affix.js
+
3
-
1
View file @
e2cabe49
...
...
@@ -54,7 +54,9 @@ $(function () {
setTimeout
(
function
()
{
window
.
scrollTo
(
0
,
document
.
body
.
scrollHeight
)
setTimeout
(
function
()
{
window
.
scroll
(
0
,
0
)
},
0
)
setTimeout
(
function
()
{
window
.
scroll
(
0
,
0
)
},
0
)
},
0
)
})
})
This diff is collapsed.
Click to expand it.
js/tests/unit/popover.js
+
3
-
1
View file @
e2cabe49
...
...
@@ -167,7 +167,9 @@ $(function () {
})
test
(
'
should destroy popover
'
,
function
()
{
var
popover
=
$
(
'
<div/>
'
).
bootstrapPopover
({
trigger
:
'
hover
'
}).
on
(
'
click.foo
'
,
function
()
{})
var
popover
=
$
(
'
<div/>
'
).
bootstrapPopover
({
trigger
:
'
hover
'
}).
on
(
'
click.foo
'
,
function
()
{})
ok
(
popover
.
data
(
'
bs.popover
'
),
'
popover has data
'
)
ok
(
$
.
_data
(
popover
[
0
],
'
events
'
).
mouseover
&&
$
.
_data
(
popover
[
0
],
'
events
'
).
mouseout
,
'
popover has hover event
'
)
ok
(
$
.
_data
(
popover
[
0
],
'
events
'
).
click
[
0
].
namespace
==
'
foo
'
,
'
popover has extra click.foo event
'
)
...
...
This diff is collapsed.
Click to expand it.
js/tests/unit/tooltip.js
+
9
-
8
View file @
e2cabe49
...
...
@@ -312,8 +312,9 @@ $(function () {
test
(
'
should show tooltip with delegate selector on click
'
,
function
()
{
var
div
=
$
(
'
<div><a href="#" rel="tooltip" title="Another tooltip"></a></div>
'
)
div
.
appendTo
(
'
#qunit-fixture
'
)
.
bootstrapTooltip
({
selector
:
'
a[rel="tooltip"]
'
,
trigger
:
'
click
'
})
div
.
appendTo
(
'
#qunit-fixture
'
).
bootstrapTooltip
({
selector
:
'
a[rel="tooltip"]
'
,
trigger
:
'
click
'
})
div
.
find
(
'
a
'
).
trigger
(
'
click
'
)
ok
(
$
(
'
.tooltip
'
).
is
(
'
.fade.in
'
),
'
tooltip is faded in
'
)
})
...
...
@@ -443,12 +444,12 @@ $(function () {
test
(
'
tooltips should be placed dynamically, with the dynamic placement option
'
,
function
()
{
$
.
support
.
transition
=
false
var
ttContainer
=
$
(
'
<div id="dynamic-tt-test"/>
'
).
css
({
height
:
400
,
overflow
:
'
hidden
'
,
position
:
'
absolute
'
,
top
:
0
,
left
:
0
,
width
:
600
height
:
400
,
overflow
:
'
hidden
'
,
position
:
'
absolute
'
,
top
:
0
,
left
:
0
,
width
:
600
})
.
appendTo
(
'
body
'
)
...
...
This diff is collapsed.
Click to expand it.
js/tooltip.js
+
1
-
1
View file @
e2cabe49
...
...
@@ -304,7 +304,7 @@
Tooltip
.
prototype
.
fixTitle
=
function
()
{
var
$e
=
this
.
$element
if
(
$e
.
attr
(
'
title
'
)
||
typeof
(
$e
.
attr
(
'
data-original-title
'
))
!=
'
string
'
)
{
if
(
$e
.
attr
(
'
title
'
)
||
typeof
(
$e
.
attr
(
'
data-original-title
'
))
!=
'
string
'
)
{
$e
.
attr
(
'
data-original-title
'
,
$e
.
attr
(
'
title
'
)
||
''
).
attr
(
'
title
'
,
''
)
}
}
...
...
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