diff options
| author | Alec Perkins | 2012-09-07 12:58:47 -0400 |
|---|---|---|
| committer | Alec Perkins | 2012-09-07 13:01:01 -0400 |
| commit | 3306e448ef4ac9f3e01312916062126dfc94c1ae (patch) | |
| tree | 571fa15e10293e3ea39e1e66601a1f1d3f6d24c7 /docs/static/js/bootstrap-dropdown.js | |
| parent | 72bdd0fcec7faa32d7f24e0698736f9433b56f3f (diff) | |
| download | django-rest-framework-3306e448ef4ac9f3e01312916062126dfc94c1ae.tar.bz2 | |
[docs] Update Bootstrap to 2.1.1
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) }) |