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
9bedfa44
Commit
9bedfa44
authored
13 years ago
by
Mark Otto
Browse files
Options
Download
Plain Diff
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
parents
c56e9d2d
314feb70
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docs/assets/js/application.js
+0
-9
docs/assets/js/application.js
js/bootstrap-dropdown.js
+1
-1
js/bootstrap-dropdown.js
with
1 addition
and
10 deletions
+1
-10
docs/assets/js/application.js
+
0
-
9
View file @
9bedfa44
...
@@ -15,15 +15,6 @@ $(function(){
...
@@ -15,15 +15,6 @@ $(function(){
// }, 0);
// }, 0);
// Docs topbar nav
// ===============
$
(
'
.nav .active
'
).
on
(
'
click
'
,
function
(
e
)
{
e
.
preventDefault
()
$
(
this
).
siblings
().
toggle
()
});
// table sort example
// table sort example
// ==================
// ==================
...
...
This diff is collapsed.
Click to expand it.
js/bootstrap-dropdown.js
+
1
-
1
View file @
9bedfa44
...
@@ -74,7 +74,7 @@
...
@@ -74,7 +74,7 @@
* =================================== */
* =================================== */
$
(
function
()
{
$
(
function
()
{
$
(
'
html
'
).
on
(
'
click.dropdown.data-api
'
,
clearMenus
)
$
(
window
).
on
(
'
click.dropdown.data-api
'
,
clearMenus
)
$
(
'
body
'
).
on
(
'
click.dropdown.data-api
'
,
toggle
,
Dropdown
.
prototype
.
toggle
)
$
(
'
body
'
).
on
(
'
click.dropdown.data-api
'
,
toggle
,
Dropdown
.
prototype
.
toggle
)
})
})
...
...
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