Skip to content

Commit

Permalink
le sigh
Browse files Browse the repository at this point in the history
  • Loading branch information
@fat
fat committed Mar 1, 2013
1 parent 16111a5 commit 40b7a90
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/assets/js/bootstrap-dropdown.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
$(document)
.on('click.dropdown.data-api', clearMenus)
.on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
.on('.dropdown-menu', function (e) { e.stopPropagation() })
.on('click.dropdown-menu', function (e) { e.stopPropagation() })
.on('click.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
.on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)

Expand Down
2 changes: 1 addition & 1 deletion docs/assets/js/bootstrap.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@
$(document)
.on('click.dropdown.data-api', clearMenus)
.on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
.on('.dropdown-menu', function (e) { e.stopPropagation() })
.on('click.dropdown-menu', function (e) { e.stopPropagation() })
.on('click.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
.on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)

Expand Down
Loading

6 comments on commit 40b7a90

@cvrebert
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixes #6835.

@rzhw
Copy link

@rzhw rzhw commented on 40b7a90 Mar 1, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dropdown-menu is only being used as a CSS class instead of an event namespace, isn't it?

@mitnal
Copy link

@mitnal mitnal commented on 40b7a90 Mar 7, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be

.on('click.dropdown.data-api', '.dropdown-menu', function (e) { e.stopPropagation() })

Also see: http://api.jquery.com/on/

.on( events [, selector ] [, data ], handler(eventObject) )

@cvrebert
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mitnal: Awesome, open a pull request.

@mitnal
Copy link

@mitnal mitnal commented on 40b7a90 Mar 7, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cvrebert will do as soon as I have time, perhaps on the weekend.

@mitnal
Copy link

@mitnal mitnal commented on 40b7a90 Mar 8, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I opened a pull request against 3.0.0-wip (#7211), if needed I can also open one against master.

Please sign in to comment.