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
3161acd7
Commit
3161acd7
authored
11 years ago
by
fat
Browse files
Options
Download
Email Patches
Plain Diff
build js
parent
c25fa066
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dist/js/bootstrap.js
+13
-3
dist/js/bootstrap.js
dist/js/bootstrap.min.js
+1
-1
dist/js/bootstrap.min.js
docs-assets/js/raw-files.js
+1
-1
docs-assets/js/raw-files.js
with
15 additions
and
5 deletions
+15
-5
dist/js/bootstrap.js
+
13
-
3
View file @
3161acd7
...
...
@@ -1130,6 +1130,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
this
.
$element
.
trigger
(
e
)
if
(
e
.
isDefaultPrevented
())
return
var
that
=
this
;
var
$tip
=
this
.
tip
()
...
...
@@ -1180,7 +1181,16 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
this
.
applyPlacement
(
calculatedOffset
,
placement
)
this
.
hoverState
=
null
this
.
$element
.
trigger
(
'
shown.bs.
'
+
this
.
type
)
var
complete
=
function
()
{
that
.
$element
.
trigger
(
'
shown.bs.
'
+
that
.
type
)
}
$
.
support
.
transition
&&
this
.
$tip
.
hasClass
(
'
fade
'
)
?
$tip
.
one
(
$
.
support
.
transition
.
end
,
complete
)
.
emulateTransitionEnd
(
150
)
:
complete
()
}
}
...
...
@@ -1263,6 +1273,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
function
complete
()
{
if
(
that
.
hoverState
!=
'
in
'
)
$tip
.
detach
()
that
.
$element
.
trigger
(
'
hidden.bs.
'
+
that
.
type
)
}
this
.
$element
.
trigger
(
e
)
...
...
@@ -1278,7 +1289,6 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
complete
()
this
.
hoverState
=
null
this
.
$element
.
trigger
(
'
hidden.bs.
'
+
this
.
type
)
return
this
}
...
...
@@ -1852,7 +1862,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
.
trigger
(
$
.
Event
(
affixType
.
replace
(
'
affix
'
,
'
affixed
'
)))
if
(
affix
==
'
bottom
'
)
{
this
.
$element
.
offset
({
top
:
document
.
body
.
offset
Height
-
offsetBottom
-
this
.
$element
.
height
()
})
this
.
$element
.
offset
({
top
:
scroll
Height
-
offsetBottom
-
this
.
$element
.
height
()
})
}
}
...
...
This diff is collapsed.
Click to expand it.
dist/js/bootstrap.min.js
+
1
-
1
View file @
3161acd7
This diff is collapsed.
Click to expand it.
docs-assets/js/raw-files.js
+
1
-
1
View file @
3161acd7
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