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
f37b3512
Commit
f37b3512
authored
May 16, 2013
by
fat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
only overlay dropdowns for mobile
parent
a72d0d6e
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
38 additions
and
26 deletions
+38
-26
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.js
+16
-12
docs/assets/js/bootstrap.min.js
docs/assets/js/bootstrap.min.js
+1
-1
docs/assets/js/collapse.js
docs/assets/js/collapse.js
+2
-2
docs/assets/js/dropdown.js
docs/assets/js/dropdown.js
+5
-1
docs/assets/js/modal.js
docs/assets/js/modal.js
+1
-1
docs/assets/js/tooltip.js
docs/assets/js/tooltip.js
+8
-8
js/dropdown.js
js/dropdown.js
+5
-1
No files found.
docs/assets/js/bootstrap.js
View file @
f37b3512
...
@@ -507,7 +507,7 @@
...
@@ -507,7 +507,7 @@
}
}
this
.
$element
[
dimension
](
0
)
this
.
$element
[
dimension
](
0
)
this
.
transition
(
'
addClass
'
,
$
.
Event
(
'
bs:collapse:show
'
),
'
shown
'
)
this
.
transition
(
'
addClass
'
,
$
.
Event
(
'
bs:collapse:show
'
),
'
bs:collapse:
shown
'
)
if
(
$
.
support
.
transition
)
this
.
$element
[
dimension
](
this
.
$element
[
0
][
scroll
])
if
(
$
.
support
.
transition
)
this
.
$element
[
dimension
](
this
.
$element
[
0
][
scroll
])
}
}
...
@@ -536,7 +536,7 @@
...
@@ -536,7 +536,7 @@
Collapse
.
prototype
.
transition
=
function
(
method
,
startEvent
,
completeEvent
)
{
Collapse
.
prototype
.
transition
=
function
(
method
,
startEvent
,
completeEvent
)
{
var
that
=
this
var
that
=
this
var
complete
=
function
()
{
var
complete
=
function
()
{
if
(
startEvent
.
type
==
'
show
'
)
that
.
reset
()
if
(
startEvent
.
type
==
'
bs:collapse:
show
'
)
that
.
reset
()
that
.
transitioning
=
0
that
.
transitioning
=
0
that
.
$element
.
trigger
(
completeEvent
)
that
.
$element
.
trigger
(
completeEvent
)
}
}
...
@@ -647,7 +647,10 @@
...
@@ -647,7 +647,10 @@
clearMenus
()
clearMenus
()
if
(
!
isActive
)
{
if
(
!
isActive
)
{
$
(
'
<div class="dropdown-backdrop"/>
'
).
insertBefore
(
$
(
this
)).
on
(
'
click
'
,
clearMenus
)
if
(
'
ontouchstart
'
in
document
.
documentElement
)
{
// if mobile we we use a backdrop because click events don't delegate
$
(
'
<div class="dropdown-backdrop"/>
'
).
insertBefore
(
$
(
this
)).
on
(
'
click
'
,
clearMenus
)
}
$parent
.
toggleClass
(
'
open
'
)
$parent
.
toggleClass
(
'
open
'
)
}
}
...
@@ -738,6 +741,7 @@
...
@@ -738,6 +741,7 @@
$
(
document
)
$
(
document
)
.
on
(
'
click.dropdown.data-api
'
,
clearMenus
)
.
on
(
'
click.dropdown.data-api
'
,
'
.dropdown form
'
,
function
(
e
)
{
e
.
stopPropagation
()
})
.
on
(
'
click.dropdown.data-api
'
,
'
.dropdown form
'
,
function
(
e
)
{
e
.
stopPropagation
()
})
.
on
(
'
click.dropdown.data-api
'
,
toggle
,
Dropdown
.
prototype
.
toggle
)
.
on
(
'
click.dropdown.data-api
'
,
toggle
,
Dropdown
.
prototype
.
toggle
)
.
on
(
'
keydown.dropdown.data-api
'
,
toggle
+
'
, [role=menu]
'
,
Dropdown
.
prototype
.
keydown
)
.
on
(
'
keydown.dropdown.data-api
'
,
toggle
+
'
, [role=menu]
'
,
Dropdown
.
prototype
.
keydown
)
...
@@ -825,7 +829,7 @@
...
@@ -825,7 +829,7 @@
})
})
}
}
Modal
.
prototype
.
show
=
function
(
e
)
{
Modal
.
prototype
.
hide
=
function
(
e
)
{
if
(
e
)
e
.
preventDefault
()
if
(
e
)
e
.
preventDefault
()
e
=
$
.
Event
(
'
bs:modal:hide
'
)
e
=
$
.
Event
(
'
bs:modal:hide
'
)
...
@@ -1035,10 +1039,10 @@
...
@@ -1035,10 +1039,10 @@
}
}
Tooltip
.
prototype
.
init
=
function
(
type
,
element
,
options
)
{
Tooltip
.
prototype
.
init
=
function
(
type
,
element
,
options
)
{
this
.
type
=
type
this
.
options
=
this
.
getOptions
(
options
)
this
.
enabled
=
true
this
.
enabled
=
true
this
.
type
=
type
this
.
$element
=
$
(
element
)
this
.
$element
=
$
(
element
)
this
.
options
=
this
.
getOptions
(
options
)
var
triggers
=
this
.
options
.
trigger
.
split
(
'
'
)
var
triggers
=
this
.
options
.
trigger
.
split
(
'
'
)
...
@@ -1086,7 +1090,7 @@
...
@@ -1086,7 +1090,7 @@
if
(
defaults
[
key
]
!=
value
)
options
[
key
]
=
value
if
(
defaults
[
key
]
!=
value
)
options
[
key
]
=
value
},
this
)
},
this
)
var
self
=
$
(
e
.
currentTarget
)[
this
.
type
](
options
).
data
(
this
.
type
)
var
self
=
$
(
e
.
currentTarget
)[
this
.
type
](
options
).
data
(
'
bs-
'
+
this
.
type
)
if
(
!
self
.
options
.
delay
||
!
self
.
options
.
delay
.
show
)
return
self
.
show
()
if
(
!
self
.
options
.
delay
||
!
self
.
options
.
delay
.
show
)
return
self
.
show
()
...
@@ -1099,7 +1103,7 @@
...
@@ -1099,7 +1103,7 @@
}
}
Tooltip
.
prototype
.
leave
=
function
(
e
)
{
Tooltip
.
prototype
.
leave
=
function
(
e
)
{
var
self
=
$
(
e
.
currentTarget
)[
this
.
type
](
this
.
_options
).
data
(
this
.
type
)
var
self
=
$
(
e
.
currentTarget
)[
this
.
type
](
this
.
_options
).
data
(
'
bs-
'
+
this
.
type
)
if
(
this
.
timeout
)
clearTimeout
(
this
.
timeout
)
if
(
this
.
timeout
)
clearTimeout
(
this
.
timeout
)
if
(
!
self
.
options
.
delay
||
!
self
.
options
.
delay
.
hide
)
return
self
.
hide
()
if
(
!
self
.
options
.
delay
||
!
self
.
options
.
delay
.
hide
)
return
self
.
hide
()
...
@@ -1155,7 +1159,7 @@
...
@@ -1155,7 +1159,7 @@
}
}
this
.
applyPlacement
(
tp
,
placement
)
this
.
applyPlacement
(
tp
,
placement
)
this
.
$element
.
trigger
(
'
shown
'
)
this
.
$element
.
trigger
(
'
bs:
'
+
this
.
type
+
'
:
shown
'
)
}
}
}
}
...
@@ -1237,7 +1241,7 @@
...
@@ -1237,7 +1241,7 @@
removeWithAnimation
()
:
removeWithAnimation
()
:
$tip
.
detach
()
$tip
.
detach
()
this
.
$element
.
trigger
(
'
hidden
'
)
this
.
$element
.
trigger
(
'
bs:
'
+
this
.
type
+
'
:
hidden
'
)
return
this
return
this
}
}
...
@@ -1301,12 +1305,12 @@
...
@@ -1301,12 +1305,12 @@
}
}
Tooltip
.
prototype
.
toggle
=
function
(
e
)
{
Tooltip
.
prototype
.
toggle
=
function
(
e
)
{
var
self
=
e
?
$
(
e
.
currentTarget
)[
this
.
type
](
this
.
_options
).
data
(
this
.
type
)
:
this
var
self
=
e
?
$
(
e
.
currentTarget
)[
this
.
type
](
this
.
_options
).
data
(
'
bs-
'
+
this
.
type
)
:
this
self
.
tip
().
hasClass
(
'
in
'
)
?
self
.
hide
()
:
self
.
show
()
self
.
tip
().
hasClass
(
'
in
'
)
?
self
.
hide
()
:
self
.
show
()
}
}
Tooltip
.
prototype
.
destroy
=
function
()
{
Tooltip
.
prototype
.
destroy
=
function
()
{
this
.
hide
().
$element
.
off
(
'
.
'
+
this
.
type
).
removeData
(
this
.
type
)
this
.
hide
().
$element
.
off
(
'
.
'
+
this
.
type
).
removeData
(
'
bs-
'
+
this
.
type
)
}
}
...
...
docs/assets/js/bootstrap.min.js
View file @
f37b3512
This diff is collapsed.
Click to expand it.
docs/assets/js/collapse.js
View file @
f37b3512
...
@@ -56,7 +56,7 @@
...
@@ -56,7 +56,7 @@
}
}
this
.
$element
[
dimension
](
0
)
this
.
$element
[
dimension
](
0
)
this
.
transition
(
'
addClass
'
,
$
.
Event
(
'
bs:collapse:show
'
),
'
shown
'
)
this
.
transition
(
'
addClass
'
,
$
.
Event
(
'
bs:collapse:show
'
),
'
bs:collapse:
shown
'
)
if
(
$
.
support
.
transition
)
this
.
$element
[
dimension
](
this
.
$element
[
0
][
scroll
])
if
(
$
.
support
.
transition
)
this
.
$element
[
dimension
](
this
.
$element
[
0
][
scroll
])
}
}
...
@@ -85,7 +85,7 @@
...
@@ -85,7 +85,7 @@
Collapse
.
prototype
.
transition
=
function
(
method
,
startEvent
,
completeEvent
)
{
Collapse
.
prototype
.
transition
=
function
(
method
,
startEvent
,
completeEvent
)
{
var
that
=
this
var
that
=
this
var
complete
=
function
()
{
var
complete
=
function
()
{
if
(
startEvent
.
type
==
'
show
'
)
that
.
reset
()
if
(
startEvent
.
type
==
'
bs:collapse:
show
'
)
that
.
reset
()
that
.
transitioning
=
0
that
.
transitioning
=
0
that
.
$element
.
trigger
(
completeEvent
)
that
.
$element
.
trigger
(
completeEvent
)
}
}
...
...
docs/assets/js/dropdown.js
View file @
f37b3512
...
@@ -43,7 +43,10 @@
...
@@ -43,7 +43,10 @@
clearMenus
()
clearMenus
()
if
(
!
isActive
)
{
if
(
!
isActive
)
{
$
(
'
<div class="dropdown-backdrop"/>
'
).
insertBefore
(
$
(
this
)).
on
(
'
click
'
,
clearMenus
)
if
(
'
ontouchstart
'
in
document
.
documentElement
)
{
// if mobile we we use a backdrop because click events don't delegate
$
(
'
<div class="dropdown-backdrop"/>
'
).
insertBefore
(
$
(
this
)).
on
(
'
click
'
,
clearMenus
)
}
$parent
.
toggleClass
(
'
open
'
)
$parent
.
toggleClass
(
'
open
'
)
}
}
...
@@ -134,6 +137,7 @@
...
@@ -134,6 +137,7 @@
$
(
document
)
$
(
document
)
.
on
(
'
click.dropdown.data-api
'
,
clearMenus
)
.
on
(
'
click.dropdown.data-api
'
,
'
.dropdown form
'
,
function
(
e
)
{
e
.
stopPropagation
()
})
.
on
(
'
click.dropdown.data-api
'
,
'
.dropdown form
'
,
function
(
e
)
{
e
.
stopPropagation
()
})
.
on
(
'
click.dropdown.data-api
'
,
toggle
,
Dropdown
.
prototype
.
toggle
)
.
on
(
'
click.dropdown.data-api
'
,
toggle
,
Dropdown
.
prototype
.
toggle
)
.
on
(
'
keydown.dropdown.data-api
'
,
toggle
+
'
, [role=menu]
'
,
Dropdown
.
prototype
.
keydown
)
.
on
(
'
keydown.dropdown.data-api
'
,
toggle
+
'
, [role=menu]
'
,
Dropdown
.
prototype
.
keydown
)
...
...
docs/assets/js/modal.js
View file @
f37b3512
...
@@ -80,7 +80,7 @@
...
@@ -80,7 +80,7 @@
})
})
}
}
Modal
.
prototype
.
show
=
function
(
e
)
{
Modal
.
prototype
.
hide
=
function
(
e
)
{
if
(
e
)
e
.
preventDefault
()
if
(
e
)
e
.
preventDefault
()
e
=
$
.
Event
(
'
bs:modal:hide
'
)
e
=
$
.
Event
(
'
bs:modal:hide
'
)
...
...
docs/assets/js/tooltip.js
View file @
f37b3512
...
@@ -48,10 +48,10 @@
...
@@ -48,10 +48,10 @@
}
}
Tooltip
.
prototype
.
init
=
function
(
type
,
element
,
options
)
{
Tooltip
.
prototype
.
init
=
function
(
type
,
element
,
options
)
{
this
.
type
=
type
this
.
options
=
this
.
getOptions
(
options
)
this
.
enabled
=
true
this
.
enabled
=
true
this
.
type
=
type
this
.
$element
=
$
(
element
)
this
.
$element
=
$
(
element
)
this
.
options
=
this
.
getOptions
(
options
)
var
triggers
=
this
.
options
.
trigger
.
split
(
'
'
)
var
triggers
=
this
.
options
.
trigger
.
split
(
'
'
)
...
@@ -99,7 +99,7 @@
...
@@ -99,7 +99,7 @@
if
(
defaults
[
key
]
!=
value
)
options
[
key
]
=
value
if
(
defaults
[
key
]
!=
value
)
options
[
key
]
=
value
},
this
)
},
this
)
var
self
=
$
(
e
.
currentTarget
)[
this
.
type
](
options
).
data
(
this
.
type
)
var
self
=
$
(
e
.
currentTarget
)[
this
.
type
](
options
).
data
(
'
bs-
'
+
this
.
type
)
if
(
!
self
.
options
.
delay
||
!
self
.
options
.
delay
.
show
)
return
self
.
show
()
if
(
!
self
.
options
.
delay
||
!
self
.
options
.
delay
.
show
)
return
self
.
show
()
...
@@ -112,7 +112,7 @@
...
@@ -112,7 +112,7 @@
}
}
Tooltip
.
prototype
.
leave
=
function
(
e
)
{
Tooltip
.
prototype
.
leave
=
function
(
e
)
{
var
self
=
$
(
e
.
currentTarget
)[
this
.
type
](
this
.
_options
).
data
(
this
.
type
)
var
self
=
$
(
e
.
currentTarget
)[
this
.
type
](
this
.
_options
).
data
(
'
bs-
'
+
this
.
type
)
if
(
this
.
timeout
)
clearTimeout
(
this
.
timeout
)
if
(
this
.
timeout
)
clearTimeout
(
this
.
timeout
)
if
(
!
self
.
options
.
delay
||
!
self
.
options
.
delay
.
hide
)
return
self
.
hide
()
if
(
!
self
.
options
.
delay
||
!
self
.
options
.
delay
.
hide
)
return
self
.
hide
()
...
@@ -168,7 +168,7 @@
...
@@ -168,7 +168,7 @@
}
}
this
.
applyPlacement
(
tp
,
placement
)
this
.
applyPlacement
(
tp
,
placement
)
this
.
$element
.
trigger
(
'
shown
'
)
this
.
$element
.
trigger
(
'
bs:
'
+
this
.
type
+
'
:
shown
'
)
}
}
}
}
...
@@ -250,7 +250,7 @@
...
@@ -250,7 +250,7 @@
removeWithAnimation
()
:
removeWithAnimation
()
:
$tip
.
detach
()
$tip
.
detach
()
this
.
$element
.
trigger
(
'
hidden
'
)
this
.
$element
.
trigger
(
'
bs:
'
+
this
.
type
+
'
:
hidden
'
)
return
this
return
this
}
}
...
@@ -314,12 +314,12 @@
...
@@ -314,12 +314,12 @@
}
}
Tooltip
.
prototype
.
toggle
=
function
(
e
)
{
Tooltip
.
prototype
.
toggle
=
function
(
e
)
{
var
self
=
e
?
$
(
e
.
currentTarget
)[
this
.
type
](
this
.
_options
).
data
(
this
.
type
)
:
this
var
self
=
e
?
$
(
e
.
currentTarget
)[
this
.
type
](
this
.
_options
).
data
(
'
bs-
'
+
this
.
type
)
:
this
self
.
tip
().
hasClass
(
'
in
'
)
?
self
.
hide
()
:
self
.
show
()
self
.
tip
().
hasClass
(
'
in
'
)
?
self
.
hide
()
:
self
.
show
()
}
}
Tooltip
.
prototype
.
destroy
=
function
()
{
Tooltip
.
prototype
.
destroy
=
function
()
{
this
.
hide
().
$element
.
off
(
'
.
'
+
this
.
type
).
removeData
(
this
.
type
)
this
.
hide
().
$element
.
off
(
'
.
'
+
this
.
type
).
removeData
(
'
bs-
'
+
this
.
type
)
}
}
...
...
js/dropdown.js
View file @
f37b3512
...
@@ -43,7 +43,10 @@
...
@@ -43,7 +43,10 @@
clearMenus
()
clearMenus
()
if
(
!
isActive
)
{
if
(
!
isActive
)
{
$
(
'
<div class="dropdown-backdrop"/>
'
).
insertBefore
(
$
(
this
)).
on
(
'
click
'
,
clearMenus
)
if
(
'
ontouchstart
'
in
document
.
documentElement
)
{
// if mobile we we use a backdrop because click events don't delegate
$
(
'
<div class="dropdown-backdrop"/>
'
).
insertBefore
(
$
(
this
)).
on
(
'
click
'
,
clearMenus
)
}
$parent
.
toggleClass
(
'
open
'
)
$parent
.
toggleClass
(
'
open
'
)
}
}
...
@@ -134,6 +137,7 @@
...
@@ -134,6 +137,7 @@
$
(
document
)
$
(
document
)
.
on
(
'
click.dropdown.data-api
'
,
clearMenus
)
.
on
(
'
click.dropdown.data-api
'
,
'
.dropdown form
'
,
function
(
e
)
{
e
.
stopPropagation
()
})
.
on
(
'
click.dropdown.data-api
'
,
'
.dropdown form
'
,
function
(
e
)
{
e
.
stopPropagation
()
})
.
on
(
'
click.dropdown.data-api
'
,
toggle
,
Dropdown
.
prototype
.
toggle
)
.
on
(
'
click.dropdown.data-api
'
,
toggle
,
Dropdown
.
prototype
.
toggle
)
.
on
(
'
keydown.dropdown.data-api
'
,
toggle
+
'
, [role=menu]
'
,
Dropdown
.
prototype
.
keydown
)
.
on
(
'
keydown.dropdown.data-api
'
,
toggle
+
'
, [role=menu]
'
,
Dropdown
.
prototype
.
keydown
)
...
...
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