diff options
| author | Tom Christie | 2012-09-07 15:25:58 -0700 |
|---|---|---|
| committer | Tom Christie | 2012-09-07 15:25:58 -0700 |
| commit | 8f119a8c34c1ebb3cf82152aa7900d316f64c0d8 (patch) | |
| tree | 66b91abceb1d13adfa4100ce7a9eeafab1c8b428 /docs/static/js/bootstrap-dropdown.js | |
| parent | 80c50bfd2d8680d4836ccf0f3594518622dfec02 (diff) | |
| parent | f95f96aba7c7f1ea26af09b9e768d5c8997bac98 (diff) | |
| download | django-rest-framework-8f119a8c34c1ebb3cf82152aa7900d316f64c0d8.tar.bz2 | |
Merge pull request #253 from droptype/rf2-docfixes
Fixes for the documentation styles
Diffstat (limited to 'docs/static/js/bootstrap-dropdown.js')
| -rwxr-xr-x[-rw-r--r--] | docs/static/js/bootstrap-dropdown.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/static/js/bootstrap-dropdown.js b/docs/static/js/bootstrap-dropdown.js index ab601e9e..42370dfb 100644..100755 --- a/docs/static/js/bootstrap-dropdown.js +++ b/docs/static/js/bootstrap-dropdown.js @@ -1,5 +1,5 @@ /* ============================================================ - * bootstrap-dropdown.js v2.1.0 + * bootstrap-dropdown.js v2.1.1 * http://twitter.github.com/bootstrap/javascript.html#dropdowns * ============================================================ * Copyright 2012 Twitter, Inc. @@ -110,7 +110,7 @@ if (!selector) { selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 } $parent = $(selector) @@ -142,7 +142,7 @@ $('html') .on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus) $('body') - .on('click.dropdown touchstart.dropdown.data-api', '.dropdown', function (e) { e.stopPropagation() }) + .on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) .on('click.dropdown.data-api touchstart.dropdown.data-api' , toggle, Dropdown.prototype.toggle) .on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) }) |