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
0cf94b82
Commit
0cf94b82
authored
10 years ago
by
Heinrich Fenkart
Browse files
Options
Download
Email Patches
Plain Diff
grunt
parent
a97db648
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
dist/js/bootstrap.js
+2
-1
dist/js/bootstrap.js
dist/js/bootstrap.min.js
+1
-1
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
+2
-1
docs/dist/js/bootstrap.js
docs/dist/js/bootstrap.min.js
+1
-1
docs/dist/js/bootstrap.min.js
with
8 additions
and
6 deletions
+8
-6
dist/js/bootstrap.js
+
2
-
1
View file @
0cf94b82
...
@@ -553,7 +553,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
...
@@ -553,7 +553,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
this
.
$element
.
trigger
(
startEvent
)
this
.
$element
.
trigger
(
startEvent
)
if
(
startEvent
.
isDefaultPrevented
())
return
if
(
startEvent
.
isDefaultPrevented
())
return
var
actives
=
this
.
$parent
&&
this
.
$parent
.
find
(
'
> .panel
> .
in
'
)
var
actives
=
this
.
$parent
&&
this
.
$parent
.
find
(
'
> .panel
'
).
children
(
'
.in, .collaps
in
g
'
)
if
(
actives
&&
actives
.
length
)
{
if
(
actives
&&
actives
.
length
)
{
var
hasData
=
actives
.
data
(
'
bs.collapse
'
)
var
hasData
=
actives
.
data
(
'
bs.collapse
'
)
...
@@ -1785,6 +1785,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
...
@@ -1785,6 +1785,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
return
(
$href
return
(
$href
&&
$href
.
length
&&
$href
.
length
&&
$href
.
is
(
'
:visible
'
)
&&
$href
.
is
(
'
:visible
'
)
&&
$el
.
is
(
'
:visible
'
)
&&
[[
$href
[
offsetMethod
]().
top
+
offsetBase
,
href
]])
||
null
&&
[[
$href
[
offsetMethod
]().
top
+
offsetBase
,
href
]])
||
null
})
})
.
sort
(
function
(
a
,
b
)
{
return
a
[
0
]
-
b
[
0
]
})
.
sort
(
function
(
a
,
b
)
{
return
a
[
0
]
-
b
[
0
]
})
...
...
This diff is collapsed.
Click to expand it.
dist/js/bootstrap.min.js
+
1
-
1
View file @
0cf94b82
This diff is collapsed.
Click to expand it.
docs/assets/js/customize.min.js
+
1
-
1
View file @
0cf94b82
This diff is collapsed.
Click to expand it.
docs/assets/js/raw-files.min.js
+
1
-
1
View file @
0cf94b82
This diff is collapsed.
Click to expand it.
docs/dist/js/bootstrap.js
+
2
-
1
View file @
0cf94b82
...
@@ -553,7 +553,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
...
@@ -553,7 +553,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
this
.
$element
.
trigger
(
startEvent
)
this
.
$element
.
trigger
(
startEvent
)
if
(
startEvent
.
isDefaultPrevented
())
return
if
(
startEvent
.
isDefaultPrevented
())
return
var
actives
=
this
.
$parent
&&
this
.
$parent
.
find
(
'
> .panel
> .
in
'
)
var
actives
=
this
.
$parent
&&
this
.
$parent
.
find
(
'
> .panel
'
).
children
(
'
.in, .collaps
in
g
'
)
if
(
actives
&&
actives
.
length
)
{
if
(
actives
&&
actives
.
length
)
{
var
hasData
=
actives
.
data
(
'
bs.collapse
'
)
var
hasData
=
actives
.
data
(
'
bs.collapse
'
)
...
@@ -1785,6 +1785,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
...
@@ -1785,6 +1785,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
return
(
$href
return
(
$href
&&
$href
.
length
&&
$href
.
length
&&
$href
.
is
(
'
:visible
'
)
&&
$href
.
is
(
'
:visible
'
)
&&
$el
.
is
(
'
:visible
'
)
&&
[[
$href
[
offsetMethod
]().
top
+
offsetBase
,
href
]])
||
null
&&
[[
$href
[
offsetMethod
]().
top
+
offsetBase
,
href
]])
||
null
})
})
.
sort
(
function
(
a
,
b
)
{
return
a
[
0
]
-
b
[
0
]
})
.
sort
(
function
(
a
,
b
)
{
return
a
[
0
]
-
b
[
0
]
})
...
...
This diff is collapsed.
Click to expand it.
docs/dist/js/bootstrap.min.js
+
1
-
1
View file @
0cf94b82
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