Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
bootstrap
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
bootstrap
Commits
e2cabe49
Commit
e2cabe49
authored
May 29, 2014
by
XhmikosR
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor style tweaks.
parent
82fc03f3
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
30 additions
and
20 deletions
+30
-20
docs/assets/js/_src/customizer.js
docs/assets/js/_src/customizer.js
+2
-4
js/affix.js
js/affix.js
+3
-1
js/carousel.js
js/carousel.js
+8
-3
js/modal.js
js/modal.js
+1
-1
js/tests/unit/affix.js
js/tests/unit/affix.js
+3
-1
js/tests/unit/popover.js
js/tests/unit/popover.js
+3
-1
js/tests/unit/tooltip.js
js/tests/unit/tooltip.js
+9
-8
js/tooltip.js
js/tooltip.js
+1
-1
No files found.
docs/assets/js/_src/customizer.js
View file @
e2cabe49
...
@@ -80,8 +80,7 @@ window.onload = function () { // wait for load in a dumb way because B-0
...
@@ -80,8 +80,7 @@ window.onload = function () { // wait for load in a dumb way because B-0
.
error
(
function
(
err
)
{
.
error
(
function
(
err
)
{
try
{
try
{
showError
(
'
<strong>Ruh roh!</strong> Could not save gist file, configuration not saved.
'
,
err
)
showError
(
'
<strong>Ruh roh!</strong> Could not save gist file, configuration not saved.
'
,
err
)
}
}
catch
(
sameErr
)
{
catch
(
sameErr
)
{
// deliberately ignore the error
// deliberately ignore the error
}
}
callback
(
'
<none>
'
,
'
<none>
'
)
callback
(
'
<none>
'
,
'
<none>
'
)
...
@@ -416,8 +415,7 @@ window.onload = function () { // wait for load in a dumb way because B-0
...
@@ -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
// than "blob:", which means it has been polyfilled and is not supported by
// this browser.
// this browser.
failback
()
failback
()
}
}
else
{
else
{
$
(
'
<img>
'
)
$
(
'
<img>
'
)
.
on
(
'
load
'
,
function
()
{
.
on
(
'
load
'
,
function
()
{
$compileBtn
.
prop
(
'
disabled
'
,
false
)
$compileBtn
.
prop
(
'
disabled
'
,
false
)
...
...
js/affix.js
View file @
e2cabe49
...
@@ -86,7 +86,9 @@
...
@@ -86,7 +86,9 @@
.
trigger
(
$
.
Event
(
affixType
.
replace
(
'
affix
'
,
'
affixed
'
)))
.
trigger
(
$
.
Event
(
affixType
.
replace
(
'
affix
'
,
'
affixed
'
)))
if
(
affix
==
'
bottom
'
)
{
if
(
affix
==
'
bottom
'
)
{
this
.
$element
.
offset
({
top
:
scrollHeight
-
this
.
$element
.
height
()
-
offsetBottom
})
this
.
$element
.
offset
({
top
:
scrollHeight
-
this
.
$element
.
height
()
-
offsetBottom
})
}
}
}
}
...
...
js/carousel.js
View file @
e2cabe49
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
wrap
:
true
wrap
:
true
}
}
Carousel
.
prototype
.
cycle
=
function
(
e
)
{
Carousel
.
prototype
.
cycle
=
function
(
e
)
{
e
||
(
this
.
paused
=
false
)
e
||
(
this
.
paused
=
false
)
this
.
interval
&&
clearInterval
(
this
.
interval
)
this
.
interval
&&
clearInterval
(
this
.
interval
)
...
@@ -106,7 +106,10 @@
...
@@ -106,7 +106,10 @@
if
(
$next
.
hasClass
(
'
active
'
))
return
(
this
.
sliding
=
false
)
if
(
$next
.
hasClass
(
'
active
'
))
return
(
this
.
sliding
=
false
)
var
relatedTarget
=
$next
[
0
]
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
)
this
.
$element
.
trigger
(
slideEvent
)
if
(
slideEvent
.
isDefaultPrevented
())
return
if
(
slideEvent
.
isDefaultPrevented
())
return
...
@@ -133,7 +136,9 @@
...
@@ -133,7 +136,9 @@
$next
.
removeClass
([
type
,
direction
].
join
(
'
'
)).
addClass
(
'
active
'
)
$next
.
removeClass
([
type
,
direction
].
join
(
'
'
)).
addClass
(
'
active
'
)
$active
.
removeClass
([
'
active
'
,
direction
].
join
(
'
'
))
$active
.
removeClass
([
'
active
'
,
direction
].
join
(
'
'
))
that
.
sliding
=
false
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
)
.
emulateTransitionEnd
(
$active
.
css
(
'
transition-duration
'
).
slice
(
0
,
-
1
)
*
1000
)
}
else
{
}
else
{
...
...
js/modal.js
View file @
e2cabe49
...
@@ -208,7 +208,7 @@
...
@@ -208,7 +208,7 @@
this
.
scrollbarWidth
=
this
.
scrollbarWidth
||
this
.
measureScrollbar
()
this
.
scrollbarWidth
=
this
.
scrollbarWidth
||
this
.
measureScrollbar
()
}
}
Modal
.
prototype
.
setScrollbar
=
function
()
{
Modal
.
prototype
.
setScrollbar
=
function
()
{
var
bodyPad
=
parseInt
((
this
.
$body
.
css
(
'
padding-right
'
)
||
0
),
10
)
var
bodyPad
=
parseInt
((
this
.
$body
.
css
(
'
padding-right
'
)
||
0
),
10
)
if
(
this
.
scrollbarWidth
)
this
.
$body
.
css
(
'
padding-right
'
,
bodyPad
+
this
.
scrollbarWidth
)
if
(
this
.
scrollbarWidth
)
this
.
$body
.
css
(
'
padding-right
'
,
bodyPad
+
this
.
scrollbarWidth
)
}
}
...
...
js/tests/unit/affix.js
View file @
e2cabe49
...
@@ -54,7 +54,9 @@ $(function () {
...
@@ -54,7 +54,9 @@ $(function () {
setTimeout
(
function
()
{
setTimeout
(
function
()
{
window
.
scrollTo
(
0
,
document
.
body
.
scrollHeight
)
window
.
scrollTo
(
0
,
document
.
body
.
scrollHeight
)
setTimeout
(
function
()
{
window
.
scroll
(
0
,
0
)
},
0
)
setTimeout
(
function
()
{
window
.
scroll
(
0
,
0
)
},
0
)
},
0
)
},
0
)
})
})
})
})
js/tests/unit/popover.js
View file @
e2cabe49
...
@@ -167,7 +167,9 @@ $(function () {
...
@@ -167,7 +167,9 @@ $(function () {
})
})
test
(
'
should destroy popover
'
,
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
(
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
'
).
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
'
)
ok
(
$
.
_data
(
popover
[
0
],
'
events
'
).
click
[
0
].
namespace
==
'
foo
'
,
'
popover has extra click.foo event
'
)
...
...
js/tests/unit/tooltip.js
View file @
e2cabe49
...
@@ -312,8 +312,9 @@ $(function () {
...
@@ -312,8 +312,9 @@ $(function () {
test
(
'
should show tooltip with delegate selector on click
'
,
function
()
{
test
(
'
should show tooltip with delegate selector on click
'
,
function
()
{
var
div
=
$
(
'
<div><a href="#" rel="tooltip" title="Another tooltip"></a></div>
'
)
var
div
=
$
(
'
<div><a href="#" rel="tooltip" title="Another tooltip"></a></div>
'
)
div
.
appendTo
(
'
#qunit-fixture
'
)
div
.
appendTo
(
'
#qunit-fixture
'
).
bootstrapTooltip
({
.
bootstrapTooltip
({
selector
:
'
a[rel="tooltip"]
'
,
trigger
:
'
click
'
})
selector
:
'
a[rel="tooltip"]
'
,
trigger
:
'
click
'
})
div
.
find
(
'
a
'
).
trigger
(
'
click
'
)
div
.
find
(
'
a
'
).
trigger
(
'
click
'
)
ok
(
$
(
'
.tooltip
'
).
is
(
'
.fade.in
'
),
'
tooltip is faded in
'
)
ok
(
$
(
'
.tooltip
'
).
is
(
'
.fade.in
'
),
'
tooltip is faded in
'
)
})
})
...
@@ -443,12 +444,12 @@ $(function () {
...
@@ -443,12 +444,12 @@ $(function () {
test
(
'
tooltips should be placed dynamically, with the dynamic placement option
'
,
function
()
{
test
(
'
tooltips should be placed dynamically, with the dynamic placement option
'
,
function
()
{
$
.
support
.
transition
=
false
$
.
support
.
transition
=
false
var
ttContainer
=
$
(
'
<div id="dynamic-tt-test"/>
'
).
css
({
var
ttContainer
=
$
(
'
<div id="dynamic-tt-test"/>
'
).
css
({
height
:
400
,
height
:
400
,
overflow
:
'
hidden
'
,
overflow
:
'
hidden
'
,
position
:
'
absolute
'
,
position
:
'
absolute
'
,
top
:
0
,
top
:
0
,
left
:
0
,
left
:
0
,
width
:
600
width
:
600
})
})
.
appendTo
(
'
body
'
)
.
appendTo
(
'
body
'
)
...
...
js/tooltip.js
View file @
e2cabe49
...
@@ -304,7 +304,7 @@
...
@@ -304,7 +304,7 @@
Tooltip
.
prototype
.
fixTitle
=
function
()
{
Tooltip
.
prototype
.
fixTitle
=
function
()
{
var
$e
=
this
.
$element
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
'
,
''
)
$e
.
attr
(
'
data-original-title
'
,
$e
.
attr
(
'
title
'
)
||
''
).
attr
(
'
title
'
,
''
)
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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