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
03a8949d
Commit
03a8949d
authored
10 years ago
by
XhmikosR
Browse files
Options
Download
Email Patches
Plain Diff
Run `grunt`.
parent
e2cabe49
5 merge requests
!28721
Hot test
,
!16605
Test pull please ignore
,
!22103
test
,
!25326
Adjust examples
,
!13388
Improve JS style
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
dist/js/bootstrap.js
+31
-22
dist/js/bootstrap.js
dist/js/bootstrap.min.js
+1
-1
dist/js/bootstrap.min.js
docs/assets/js/customize.min.js
+2
-2
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js
+1
-1
docs/assets/js/docs.min.js
docs/assets/js/raw-files.min.js
+2
-2
docs/assets/js/raw-files.min.js
docs/dist/js/bootstrap.min.js
+1
-1
docs/dist/js/bootstrap.min.js
with
38 additions
and
29 deletions
+38
-29
dist/js/bootstrap.js
+
31
-
22
View file @
03a8949d
...
...
@@ -42,7 +42,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
// http://blog.alexmaccaw.com/css-transitions
$
.
fn
.
emulateTransitionEnd
=
function
(
duration
)
{
var
called
=
false
,
$el
=
this
var
called
=
false
var
$el
=
this
$
(
this
).
one
(
$
.
support
.
transition
.
end
,
function
()
{
called
=
true
})
var
callback
=
function
()
{
if
(
!
called
)
$
(
$el
).
trigger
(
$
.
support
.
transition
.
end
)
}
setTimeout
(
callback
,
duration
)
...
...
@@ -297,7 +298,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
wrap
:
true
}
Carousel
.
prototype
.
cycle
=
function
(
e
)
{
Carousel
.
prototype
.
cycle
=
function
(
e
)
{
e
||
(
this
.
paused
=
false
)
this
.
interval
&&
clearInterval
(
this
.
interval
)
...
...
@@ -364,10 +365,13 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
$next
=
this
.
$element
.
find
(
'
.item
'
)[
fallback
]()
}
if
(
$next
.
hasClass
(
'
active
'
))
return
this
.
sliding
=
false
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
...
...
@@ -394,7 +398,9 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
$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
{
...
...
@@ -446,7 +452,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
// =================
$
(
document
).
on
(
'
click.bs.carousel.data-api
'
,
'
[data-slide], [data-slide-to]
'
,
function
(
e
)
{
var
$this
=
$
(
this
),
href
var
href
var
$this
=
$
(
this
)
var
$target
=
$
(
$this
.
attr
(
'
data-target
'
)
||
(
href
=
$this
.
attr
(
'
href
'
))
&&
href
.
replace
(
/.*
(?=
#
[^\s]
+$
)
/
,
''
))
//strip for ie7
var
options
=
$
.
extend
({},
$target
.
data
(),
$this
.
data
())
var
slideIndex
=
$this
.
attr
(
'
data-slide-to
'
)
...
...
@@ -454,7 +461,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
Plugin
.
call
(
$target
,
options
)
if
(
slideIndex
=
$this
.
attr
(
'
data-slide-to
'
)
)
{
if
(
slideIndex
)
{
$target
.
data
(
'
bs.carousel
'
).
to
(
slideIndex
)
}
...
...
@@ -631,7 +638,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
// =================
$
(
document
).
on
(
'
click.bs.collapse.data-api
'
,
'
[data-toggle="collapse"]
'
,
function
(
e
)
{
var
$this
=
$
(
this
),
href
var
href
var
$this
=
$
(
this
)
var
target
=
$this
.
attr
(
'
data-target
'
)
||
e
.
preventDefault
()
||
(
href
=
$this
.
attr
(
'
href
'
))
&&
href
.
replace
(
/.*
(?=
#
[^\s]
+$
)
/
,
''
)
//strip for ie7
...
...
@@ -993,7 +1001,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
}
else
if
(
!
this
.
isShown
&&
this
.
$backdrop
)
{
this
.
$backdrop
.
removeClass
(
'
in
'
)
var
callbackRemove
=
function
()
{
var
callbackRemove
=
function
()
{
that
.
removeBackdrop
()
callback
&&
callback
()
}
...
...
@@ -1013,8 +1021,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
this
.
scrollbarWidth
=
this
.
scrollbarWidth
||
this
.
measureScrollbar
()
}
Modal
.
prototype
.
setScrollbar
=
function
()
{
var
bodyPad
=
parseInt
(
this
.
$body
.
css
(
'
padding-right
'
)
||
0
)
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
)
}
...
...
@@ -1282,7 +1290,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
this
.
applyPlacement
(
calculatedOffset
,
placement
)
this
.
hoverState
=
null
var
complete
=
function
()
{
var
complete
=
function
()
{
that
.
$element
.
trigger
(
'
shown.bs.
'
+
that
.
type
)
}
...
...
@@ -1387,7 +1395,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
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
'
,
''
)
}
}
...
...
@@ -1404,7 +1412,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
scroll
:
isBody
?
document
.
documentElement
.
scrollTop
||
document
.
body
.
scrollTop
:
$element
.
scrollTop
(),
width
:
isBody
?
$
(
window
).
width
()
:
$element
.
outerWidth
(),
height
:
isBody
?
$
(
window
).
height
()
:
$element
.
outerHeight
()
},
isBody
?
{
top
:
0
,
left
:
0
}
:
$element
.
offset
())
},
isBody
?
{
top
:
0
,
left
:
0
}
:
$element
.
offset
())
}
Tooltip
.
prototype
.
getCalculatedOffset
=
function
(
placement
,
pos
,
actualWidth
,
actualHeight
)
{
...
...
@@ -1461,11 +1469,11 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
}
Tooltip
.
prototype
.
tip
=
function
()
{
return
this
.
$tip
=
this
.
$tip
||
$
(
this
.
options
.
template
)
return
(
this
.
$tip
=
this
.
$tip
||
$
(
this
.
options
.
template
)
)
}
Tooltip
.
prototype
.
arrow
=
function
()
{
return
this
.
$arrow
=
this
.
$arrow
||
this
.
tip
().
find
(
'
.tooltip-arrow
'
)
return
(
this
.
$arrow
=
this
.
$arrow
||
this
.
tip
().
find
(
'
.tooltip-arrow
'
)
)
}
Tooltip
.
prototype
.
validate
=
function
()
{
...
...
@@ -1612,7 +1620,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
}
Popover
.
prototype
.
arrow
=
function
()
{
return
this
.
$arrow
=
this
.
$arrow
||
this
.
tip
().
find
(
'
.arrow
'
)
return
(
this
.
$arrow
=
this
.
$arrow
||
this
.
tip
().
find
(
'
.arrow
'
)
)
}
Popover
.
prototype
.
tip
=
function
()
{
...
...
@@ -1697,7 +1705,6 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
this
.
offsets
=
$
([])
this
.
targets
=
$
([])
var
self
=
this
this
.
$body
...
...
@@ -1711,7 +1718,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
return
(
$href
&&
$href
.
length
&&
$href
.
is
(
'
:visible
'
)
&&
[[
$href
[
offsetMethod
]().
top
+
(
!
$
.
isWindow
(
self
.
$scrollElement
.
get
(
0
))
&&
self
.
$scrollElement
.
scrollTop
()),
href
]])
||
null
&&
[[
$href
[
offsetMethod
]().
top
+
(
!
$
.
isWindow
(
self
.
$scrollElement
.
get
(
0
))
&&
self
.
$scrollElement
.
scrollTop
()),
href
]])
||
null
})
.
sort
(
function
(
a
,
b
)
{
return
a
[
0
]
-
b
[
0
]
})
.
each
(
function
()
{
...
...
@@ -1741,7 +1748,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
activeTarget
!=
targets
[
i
]
&&
scrollTop
>=
offsets
[
i
]
&&
(
!
offsets
[
i
+
1
]
||
scrollTop
<=
offsets
[
i
+
1
])
&&
this
.
activate
(
targets
[
i
]
)
&&
this
.
activate
(
targets
[
i
])
}
}
...
...
@@ -1905,7 +1912,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
// TAB PLUGIN DEFINITION
// =====================
function
Plugin
(
option
)
{
function
Plugin
(
option
)
{
return
this
.
each
(
function
()
{
var
$this
=
$
(
this
)
var
data
=
$this
.
data
(
'
bs.tab
'
)
...
...
@@ -2028,7 +2035,9 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
.
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.
dist/js/bootstrap.min.js
+
1
-
1
View file @
03a8949d
This diff is collapsed.
Click to expand it.
docs/assets/js/customize.min.js
+
2
-
2
View file @
03a8949d
This diff is collapsed.
Click to expand it.
docs/assets/js/docs.min.js
+
1
-
1
View file @
03a8949d
...
...
@@ -13,4 +13,4 @@ var Holder=Holder||{};!function(a,b){function c(a,b,c){b=parseInt(b,10),a=parseI
* Licensed under the Creative Commons Attribution 3.0 Unported License. For
* details, see http://creativecommons.org/licenses/by/3.0/.
*/
!
function
(
a
){
a
(
function
(){
var
b
=
a
(
window
),
c
=
a
(
document
.
body
);
c
.
scrollspy
({
target
:
"
.bs-docs-sidebar
"
}),
b
.
on
(
"
load
"
,
function
(){
c
.
scrollspy
(
"
refresh
"
)}),
a
(
"
.bs-docs-container [href=#]
"
).
click
(
function
(
a
){
a
.
preventDefault
()}),
setTimeout
(
function
(){
var
b
=
a
(
"
.bs-docs-sidebar
"
);
b
.
affix
({
offset
:{
top
:
function
(){
var
c
=
b
.
offset
().
top
,
d
=
parseInt
(
b
.
children
(
0
).
css
(
"
margin-top
"
),
10
),
e
=
a
(
"
.bs-docs-nav
"
).
height
();
return
this
.
top
=
c
-
e
-
d
},
bottom
:
function
(){
return
this
.
bottom
=
a
(
"
.bs-docs-footer
"
).
outerHeight
(
!
0
)}}})},
100
),
setTimeout
(
function
(){
a
(
"
.bs-top
"
).
affix
()},
100
),
function
(){
var
b
=
a
(
"
#bs-theme-stylesheet
"
),
c
=
a
(
"
.bs-docs-theme-toggle
"
);
c
.
click
(
function
(){
var
a
=
b
.
attr
(
"
href
"
);
a
&&
0
!==
a
.
indexOf
(
"
data
"
)?(
b
.
attr
(
"
href
"
,
""
),
c
.
text
(
"
Preview theme
"
)):(
b
.
attr
(
"
href
"
,
b
.
attr
(
"
data-href
"
)),
c
.
text
(
"
Disable theme preview
"
))})}(),
a
(
"
.tooltip-demo
"
).
tooltip
({
selector
:
'
[data-toggle="tooltip"]
'
,
container
:
"
body
"
}),
a
(
"
.tooltip-test
"
).
tooltip
(),
a
(
"
.popover-test
"
).
popover
(),
a
(
"
.bs-docs-navbar
"
).
tooltip
({
selector
:
'
a[data-toggle="tooltip"]
'
,
container
:
"
.bs-docs-navbar .nav
"
}),
a
(
"
.bs-docs-popover
"
).
popover
(),
a
(
"
.bs-docs-popover-dismiss
"
).
popover
({
trigger
:
"
focus
"
}),
a
(
"
#loading-example-btn
"
).
click
(
function
(){
var
b
=
a
(
this
);
b
.
button
(
"
loading
"
),
setTimeout
(
function
(){
b
.
button
(
"
reset
"
)},
3
e3
)})})}(
jQuery
);
\ No newline at end of file
!
function
(
a
){
"
use strict
"
;
a
(
function
(){
var
b
=
a
(
window
),
c
=
a
(
document
.
body
);
c
.
scrollspy
({
target
:
"
.bs-docs-sidebar
"
}),
b
.
on
(
"
load
"
,
function
(){
c
.
scrollspy
(
"
refresh
"
)}),
a
(
"
.bs-docs-container [href=#]
"
).
click
(
function
(
a
){
a
.
preventDefault
()}),
setTimeout
(
function
(){
var
b
=
a
(
"
.bs-docs-sidebar
"
);
b
.
affix
({
offset
:{
top
:
function
(){
var
c
=
b
.
offset
().
top
,
d
=
parseInt
(
b
.
children
(
0
).
css
(
"
margin-top
"
),
10
),
e
=
a
(
"
.bs-docs-nav
"
).
height
();
return
this
.
top
=
c
-
e
-
d
},
bottom
:
function
(){
return
this
.
bottom
=
a
(
"
.bs-docs-footer
"
).
outerHeight
(
!
0
)}}})},
100
),
setTimeout
(
function
(){
a
(
"
.bs-top
"
).
affix
()},
100
),
function
(){
var
b
=
a
(
"
#bs-theme-stylesheet
"
),
c
=
a
(
"
.bs-docs-theme-toggle
"
);
c
.
click
(
function
(){
var
a
=
b
.
attr
(
"
href
"
);
a
&&
0
!==
a
.
indexOf
(
"
data
"
)?(
b
.
attr
(
"
href
"
,
""
),
c
.
text
(
"
Preview theme
"
)):(
b
.
attr
(
"
href
"
,
b
.
attr
(
"
data-href
"
)),
c
.
text
(
"
Disable theme preview
"
))})}(),
a
(
"
.tooltip-demo
"
).
tooltip
({
selector
:
'
[data-toggle="tooltip"]
'
,
container
:
"
body
"
}),
a
(
"
.tooltip-test
"
).
tooltip
(),
a
(
"
.popover-test
"
).
popover
(),
a
(
"
.bs-docs-navbar
"
).
tooltip
({
selector
:
'
a[data-toggle="tooltip"]
'
,
container
:
"
.bs-docs-navbar .nav
"
}),
a
(
"
.bs-docs-popover
"
).
popover
(),
a
(
"
.bs-docs-popover-dismiss
"
).
popover
({
trigger
:
"
focus
"
}),
a
(
"
#loading-example-btn
"
).
click
(
function
(){
var
b
=
a
(
this
);
b
.
button
(
"
loading
"
),
setTimeout
(
function
(){
b
.
button
(
"
reset
"
)},
3
e3
)})})}(
jQuery
);
\ No newline at end of file
This diff is collapsed.
Click to expand it.
docs/assets/js/raw-files.min.js
+
2
-
2
View file @
03a8949d
This diff is collapsed.
Click to expand it.
docs/dist/js/bootstrap.min.js
+
1
-
1
View file @
03a8949d
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