Skip to content
GitLab
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
cabace78
Commit
cabace78
authored
10 years ago
by
Heinrich Fenkart
Browse files
Options
Download
Email Patches
Plain Diff
G R U N T
parent
6e206f5e
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
dist/js/bootstrap.js
+7
-3
dist/js/bootstrap.js
dist/js/bootstrap.min.js
+2
-2
dist/js/bootstrap.min.js
docs/assets/js/customize.min.js
+1
-1
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
+1
-1
docs/assets/js/raw-files.min.js
docs/dist/js/bootstrap.js
+7
-3
docs/dist/js/bootstrap.js
docs/dist/js/bootstrap.min.js
+2
-2
docs/dist/js/bootstrap.min.js
with
20 additions
and
12 deletions
+20
-12
dist/js/bootstrap.js
+
7
-
3
View file @
cabace78
...
@@ -1282,7 +1282,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
...
@@ -1282,7 +1282,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
if
(
this
.
hasContent
()
&&
this
.
enabled
)
{
if
(
this
.
hasContent
()
&&
this
.
enabled
)
{
this
.
$element
.
trigger
(
e
)
this
.
$element
.
trigger
(
e
)
var
inDom
=
$
.
contains
(
d
ocument
.
documentElement
,
this
.
$element
[
0
])
var
inDom
=
$
.
contains
(
this
.
$element
[
0
].
ownerD
ocument
.
documentElement
,
this
.
$element
[
0
])
if
(
e
.
isDefaultPrevented
()
||
!
inDom
)
return
if
(
e
.
isDefaultPrevented
()
||
!
inDom
)
return
var
that
=
this
var
that
=
this
...
@@ -1459,6 +1459,10 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
...
@@ -1459,6 +1459,10 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
var
isSvg
=
window
.
SVGElement
&&
el
instanceof
window
.
SVGElement
var
isSvg
=
window
.
SVGElement
&&
el
instanceof
window
.
SVGElement
var
elRect
=
el
.
getBoundingClientRect
()
var
elRect
=
el
.
getBoundingClientRect
()
if
(
elRect
.
width
==
null
)
{
// width and height are missing in IE8, so compute them manually; see https://github.com/twbs/bootstrap/issues/14093
elRect
=
$
.
extend
({},
elRect
,
{
width
:
elRect
.
right
-
elRect
.
left
,
height
:
elRect
.
bottom
-
elRect
.
top
})
}
var
elOffset
=
isBody
?
{
top
:
0
,
left
:
0
}
:
$element
.
offset
()
var
elOffset
=
isBody
?
{
top
:
0
,
left
:
0
}
:
$element
.
offset
()
var
scroll
=
{
scroll
:
isBody
?
document
.
documentElement
.
scrollTop
||
document
.
body
.
scrollTop
:
$element
.
scrollTop
()
}
var
scroll
=
{
scroll
:
isBody
?
document
.
documentElement
.
scrollTop
||
document
.
body
.
scrollTop
:
$element
.
scrollTop
()
}
var
outerDims
=
isSvg
?
{}
:
{
var
outerDims
=
isSvg
?
{}
:
{
...
@@ -2170,8 +2174,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
...
@@ -2170,8 +2174,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
data
.
offset
=
data
.
offset
||
{}
data
.
offset
=
data
.
offset
||
{}
if
(
data
.
offsetBottom
)
data
.
offset
.
bottom
=
data
.
offsetBottom
if
(
data
.
offsetBottom
!=
null
)
data
.
offset
.
bottom
=
data
.
offsetBottom
if
(
data
.
offsetTop
)
data
.
offset
.
top
=
data
.
offsetTop
if
(
data
.
offsetTop
!=
null
)
data
.
offset
.
top
=
data
.
offsetTop
Plugin
.
call
(
$spy
,
data
)
Plugin
.
call
(
$spy
,
data
)
})
})
...
...
This diff is collapsed.
Click to expand it.
dist/js/bootstrap.min.js
+
2
-
2
View file @
cabace78
This diff is collapsed.
Click to expand it.
docs/assets/js/customize.min.js
+
1
-
1
View file @
cabace78
This diff is collapsed.
Click to expand it.
docs/assets/js/raw-files.min.js
+
1
-
1
View file @
cabace78
This diff is collapsed.
Click to expand it.
docs/dist/js/bootstrap.js
+
7
-
3
View file @
cabace78
...
@@ -1282,7 +1282,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
...
@@ -1282,7 +1282,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
if
(
this
.
hasContent
()
&&
this
.
enabled
)
{
if
(
this
.
hasContent
()
&&
this
.
enabled
)
{
this
.
$element
.
trigger
(
e
)
this
.
$element
.
trigger
(
e
)
var
inDom
=
$
.
contains
(
d
ocument
.
documentElement
,
this
.
$element
[
0
])
var
inDom
=
$
.
contains
(
this
.
$element
[
0
].
ownerD
ocument
.
documentElement
,
this
.
$element
[
0
])
if
(
e
.
isDefaultPrevented
()
||
!
inDom
)
return
if
(
e
.
isDefaultPrevented
()
||
!
inDom
)
return
var
that
=
this
var
that
=
this
...
@@ -1459,6 +1459,10 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
...
@@ -1459,6 +1459,10 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
var
isSvg
=
window
.
SVGElement
&&
el
instanceof
window
.
SVGElement
var
isSvg
=
window
.
SVGElement
&&
el
instanceof
window
.
SVGElement
var
elRect
=
el
.
getBoundingClientRect
()
var
elRect
=
el
.
getBoundingClientRect
()
if
(
elRect
.
width
==
null
)
{
// width and height are missing in IE8, so compute them manually; see https://github.com/twbs/bootstrap/issues/14093
elRect
=
$
.
extend
({},
elRect
,
{
width
:
elRect
.
right
-
elRect
.
left
,
height
:
elRect
.
bottom
-
elRect
.
top
})
}
var
elOffset
=
isBody
?
{
top
:
0
,
left
:
0
}
:
$element
.
offset
()
var
elOffset
=
isBody
?
{
top
:
0
,
left
:
0
}
:
$element
.
offset
()
var
scroll
=
{
scroll
:
isBody
?
document
.
documentElement
.
scrollTop
||
document
.
body
.
scrollTop
:
$element
.
scrollTop
()
}
var
scroll
=
{
scroll
:
isBody
?
document
.
documentElement
.
scrollTop
||
document
.
body
.
scrollTop
:
$element
.
scrollTop
()
}
var
outerDims
=
isSvg
?
{}
:
{
var
outerDims
=
isSvg
?
{}
:
{
...
@@ -2170,8 +2174,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
...
@@ -2170,8 +2174,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
data
.
offset
=
data
.
offset
||
{}
data
.
offset
=
data
.
offset
||
{}
if
(
data
.
offsetBottom
)
data
.
offset
.
bottom
=
data
.
offsetBottom
if
(
data
.
offsetBottom
!=
null
)
data
.
offset
.
bottom
=
data
.
offsetBottom
if
(
data
.
offsetTop
)
data
.
offset
.
top
=
data
.
offsetTop
if
(
data
.
offsetTop
!=
null
)
data
.
offset
.
top
=
data
.
offsetTop
Plugin
.
call
(
$spy
,
data
)
Plugin
.
call
(
$spy
,
data
)
})
})
...
...
This diff is collapsed.
Click to expand it.
docs/dist/js/bootstrap.min.js
+
2
-
2
View file @
cabace78
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