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
b9bd82b4
Commit
b9bd82b4
authored
May 17, 2013
by
fat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
patch dropdowns for #7118
parent
37d0a305
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
36 additions
and
4 deletions
+36
-4
docs/assets/css/bootstrap.css
docs/assets/css/bootstrap.css
+9
-0
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-dropdown.js
+5
-1
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.js
+5
-1
docs/assets/js/bootstrap.min.js
docs/assets/js/bootstrap.min.js
+1
-1
js/bootstrap-dropdown.js
js/bootstrap-dropdown.js
+5
-1
less/dropdowns.less
less/dropdowns.less
+11
-0
No files found.
docs/assets/css/bootstrap.css
View file @
b9bd82b4
...
@@ -3009,6 +3009,15 @@ table th[class*="span"],
...
@@ -3009,6 +3009,15 @@ table th[class*="span"],
display
:
block
;
display
:
block
;
}
}
.dropdown-backdrop
{
position
:
fixed
;
top
:
0
;
right
:
0
;
bottom
:
0
;
left
:
0
;
z-index
:
990
;
}
.pull-right
>
.dropdown-menu
{
.pull-right
>
.dropdown-menu
{
right
:
0
;
right
:
0
;
left
:
auto
;
left
:
auto
;
...
...
docs/assets/js/bootstrap-dropdown.js
View file @
b9bd82b4
...
@@ -52,6 +52,10 @@
...
@@ -52,6 +52,10 @@
clearMenus
()
clearMenus
()
if
(
!
isActive
)
{
if
(
!
isActive
)
{
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
'
)
}
}
...
@@ -104,6 +108,7 @@
...
@@ -104,6 +108,7 @@
}
}
function
clearMenus
()
{
function
clearMenus
()
{
$
(
'
.dropdown-backdrop
'
).
remove
()
$
(
toggle
).
each
(
function
()
{
$
(
toggle
).
each
(
function
()
{
getParent
(
$
(
this
)).
removeClass
(
'
open
'
)
getParent
(
$
(
this
)).
removeClass
(
'
open
'
)
})
})
...
@@ -158,7 +163,6 @@
...
@@ -158,7 +163,6 @@
$
(
document
)
$
(
document
)
.
on
(
'
click.dropdown.data-api
'
,
clearMenus
)
.
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-menu
'
,
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/bootstrap.js
View file @
b9bd82b4
...
@@ -685,6 +685,10 @@
...
@@ -685,6 +685,10 @@
clearMenus
()
clearMenus
()
if
(
!
isActive
)
{
if
(
!
isActive
)
{
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
'
)
}
}
...
@@ -737,6 +741,7 @@
...
@@ -737,6 +741,7 @@
}
}
function
clearMenus
()
{
function
clearMenus
()
{
$
(
'
.dropdown-backdrop
'
).
remove
()
$
(
toggle
).
each
(
function
()
{
$
(
toggle
).
each
(
function
()
{
getParent
(
$
(
this
)).
removeClass
(
'
open
'
)
getParent
(
$
(
this
)).
removeClass
(
'
open
'
)
})
})
...
@@ -791,7 +796,6 @@
...
@@ -791,7 +796,6 @@
$
(
document
)
$
(
document
)
.
on
(
'
click.dropdown.data-api
'
,
clearMenus
)
.
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-menu
'
,
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/bootstrap.min.js
View file @
b9bd82b4
This diff is collapsed.
Click to expand it.
js/bootstrap-dropdown.js
View file @
b9bd82b4
...
@@ -52,6 +52,10 @@
...
@@ -52,6 +52,10 @@
clearMenus
()
clearMenus
()
if
(
!
isActive
)
{
if
(
!
isActive
)
{
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
'
)
}
}
...
@@ -104,6 +108,7 @@
...
@@ -104,6 +108,7 @@
}
}
function
clearMenus
()
{
function
clearMenus
()
{
$
(
'
.dropdown-backdrop
'
).
remove
()
$
(
toggle
).
each
(
function
()
{
$
(
toggle
).
each
(
function
()
{
getParent
(
$
(
this
)).
removeClass
(
'
open
'
)
getParent
(
$
(
this
)).
removeClass
(
'
open
'
)
})
})
...
@@ -158,7 +163,6 @@
...
@@ -158,7 +163,6 @@
$
(
document
)
$
(
document
)
.
on
(
'
click.dropdown.data-api
'
,
clearMenus
)
.
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-menu
'
,
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
)
...
...
less/dropdowns.less
View file @
b9bd82b4
...
@@ -135,6 +135,17 @@
...
@@ -135,6 +135,17 @@
}
}
}
}
// Backdrop to catch body clicks on mobile, etc.
// ---------------------------
.dropdown-backdrop {
position: fixed;
left: 0;
right: 0;
bottom: 0;
top: 0;
z-index: @zindexDropdown - 10;
}
// Right aligned dropdowns
// Right aligned dropdowns
// ---------------------------
// ---------------------------
.pull-right > .dropdown-menu {
.pull-right > .dropdown-menu {
...
...
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