root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 10 Packages Projects Releases Wiki Activity

change dropdown strategy to use an overlay - fixes mobile click anywhere + allows for firefox middle click

This commit is contained in:
fat 2013-05-16 12:50:06 -07:00
parent bdbd268cb9
commit 92245e8bc7
9 changed files with 362 additions and 438 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/assets/css/bootstrap.css vendored
View File

@ -2799,6 +2799,15 @@ input[type="button"].btn-block {
outline: 0; outline: 0;
} }
.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;

167
docs/assets/js/bootstrap.js vendored
View File

@ -471,48 +471,38 @@
* ============================================================ */ * ============================================================ */
!function ($) { !function ($) { "use strict";
"use strict"; // jshint ;_; // COLLAPSE PUBLIC CLASS DEFINITION
// ================================
/* COLLAPSE PUBLIC CLASS DEFINITION
* ================================ */
var Collapse = function (element, options) { var Collapse = function (element, options) {
this.$element = $(element) this.$element = $(element)
this.options = $.extend({}, $.fn.collapse.defaults, options) this.options = $.extend({}, Collapse.DEFAULTS, options)
this.transitioning = null
if (this.options.parent) { if (this.options.parent) this.$parent = $(this.options.parent)
this.$parent = $(this.options.parent) if (this.options.toggle) this.toggle()
} }
this.options.toggle && this.toggle() Collapse.DEFAULTS = {
toggle: true
} }
Collapse.prototype = { Collapse.prototype.dimension = function () {
constructor: Collapse
, dimension: function () {
var hasWidth = this.$element.hasClass('width') var hasWidth = this.$element.hasClass('width')
return hasWidth ? 'width' : 'height' return hasWidth ? 'width' : 'height'
} }
, show: function () { Collapse.prototype.show = function () {
var dimension
, scroll
, actives
, hasData
if (this.transitioning || this.$element.hasClass('in')) return if (this.transitioning || this.$element.hasClass('in')) return
dimension = this.dimension() var dimension = this.dimension()
scroll = $.camelCase(['scroll', dimension].join('-')) var scroll = $.camelCase(['scroll', dimension].join('-'))
actives = this.$parent && this.$parent.find('> .accordion-group > .in') var actives = this.$parent && this.$parent.find('> .accordion-group > .in')
if (actives && actives.length) { if (actives && actives.length) {
hasData = actives.data('collapse') var hasData = actives.data('collapse')
if (hasData && hasData.transitioning) return if (hasData && hasData.transitioning) return
actives.collapse('hide') actives.collapse('hide')
hasData || actives.data('collapse', null) hasData || actives.data('collapse', null)
@ -520,19 +510,19 @@
this.$element[dimension](0) this.$element[dimension](0)
this.transition('addClass', $.Event('show'), 'shown') this.transition('addClass', $.Event('show'), 'shown')
$.support.transition && this.$element[dimension](this.$element[0][scroll])
if ($.support.transition) this.$element[dimension](this.$element[0][scroll])
} }
, hide: function () { Collapse.prototype.hide = function () {
var dimension
if (this.transitioning || !this.$element.hasClass('in')) return if (this.transitioning || !this.$element.hasClass('in')) return
dimension = this.dimension() var dimension = this.dimension()
this.reset(this.$element[dimension]()) this.reset(this.$element[dimension]())
this.transition('removeClass', $.Event('hide'), 'hidden') this.transition('removeClass', $.Event('hide'), 'hidden')
this.$element[dimension](0) this.$element[dimension](0)
} }
, reset: function (size) { Collapse.prototype.reset = function (size) {
var dimension = this.dimension() var dimension = this.dimension()
this.$element this.$element
@ -545,9 +535,9 @@
return this return this
} }
, transition: function (method, startEvent, completeEvent) { Collapse.prototype.transition = function (method, startEvent, completeEvent) {
var that = this var that = this
, complete = function () { var complete = function () {
if (startEvent.type == 'show') that.reset() if (startEvent.type == 'show') that.reset()
that.transitioning = 0 that.transitioning = 0
that.$element.trigger(completeEvent) that.$element.trigger(completeEvent)
@ -566,37 +556,32 @@
complete() complete()
} }
, toggle: function () { Collapse.prototype.toggle = function () {
this[this.$element.hasClass('in') ? 'hide' : 'show']() this[this.$element.hasClass('in') ? 'hide' : 'show']()
} }
}
// COLLAPSE PLUGIN DEFINITION
/* COLLAPSE PLUGIN DEFINITION // ==========================
* ========================== */
var old = $.fn.collapse var old = $.fn.collapse
$.fn.collapse = function (option) { $.fn.collapse = function (option) {
return this.each(function () { return this.each(function () {
var $this = $(this) var $this = $(this)
, data = $this.data('collapse') var data = $this.data('collapse')
, options = $.extend({}, $.fn.collapse.defaults, $this.data(), typeof option == 'object' && option) var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
if (!data) $this.data('collapse', (data = new Collapse(this, options))) if (!data) $this.data('collapse', (data = new Collapse(this, options)))
if (typeof option == 'string') data[option]() if (typeof option == 'string') data[option]()
}) })
} }
$.fn.collapse.defaults = {
toggle: true
}
$.fn.collapse.Constructor = Collapse $.fn.collapse.Constructor = Collapse
/* COLLAPSE NO CONFLICT // COLLAPSE NO CONFLICT
* ==================== */ // ====================
$.fn.collapse.noConflict = function () { $.fn.collapse.noConflict = function () {
$.fn.collapse = old $.fn.collapse = old
@ -604,15 +589,16 @@
} }
/* COLLAPSE DATA-API // COLLAPSE DATA-API
* ================= */ // =================
$(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) { $(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) {
var $this = $(this), href var $this = $(this), href
, target = $this.attr('data-target') var target = $this.attr('data-target')
|| e.preventDefault() || e.preventDefault()
|| (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
, option = $(target).data('collapse') ? 'toggle' : $this.data() var option = $(target).data('collapse') ? 'toggle' : $this.data()
$this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed') $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
$(target).collapse(option) $(target).collapse(option)
}) })
@ -638,40 +624,33 @@
* ============================================================ */ * ============================================================ */
!function ($) { !function ($) { "use strict";
"use strict"; // jshint ;_;
/* DROPDOWN CLASS DEFINITION // DROPDOWN CLASS DEFINITION
* ========================= */ // =========================
var backdrop = '.dropdown-backdrop'
var toggle = '[data-toggle=dropdown]' var toggle = '[data-toggle=dropdown]'
, Dropdown = function (element) { var Dropdown = function (element) {
var $el = $(element).on('click.dropdown.data-api', this.toggle) var $el = $(element).on('click.dropdown.data-api', this.toggle)
$('html').on('click.dropdown.data-api', function () { $('html').on('click.dropdown.data-api', function () {
$el.parent().removeClass('open') $el.parent().removeClass('open')
}) })
} }
Dropdown.prototype = { Dropdown.prototype.toggle = function (e) {
constructor: Dropdown
, toggle: function (e) {
var $this = $(this) var $this = $(this)
, $parent
, isActive
if ($this.is('.disabled, :disabled')) return if ($this.is('.disabled, :disabled')) return
$parent = getParent($this) var $parent = getParent($this)
var isActive = $parent.hasClass('open')
isActive = $parent.hasClass('open')
clearMenus() clearMenus()
if (!isActive) { if (!isActive) {
$('<div class="dropdown-backdrop"/>').insertBefore($(this)).on('click', clearMenus)
$parent.toggleClass('open') $parent.toggleClass('open')
} }
@ -680,81 +659,66 @@
return false return false
} }
, keydown: function (e) { Dropdown.prototype.keydown = function (e) {
var $this
, $items
, $active
, $parent
, isActive
, index
if (!/(38|40|27)/.test(e.keyCode)) return if (!/(38|40|27)/.test(e.keyCode)) return
$this = $(this) var $this = $(this)
e.preventDefault() e.preventDefault()
e.stopPropagation() e.stopPropagation()
if ($this.is('.disabled, :disabled')) return if ($this.is('.disabled, :disabled')) return
$parent = getParent($this) var $parent = getParent($this)
var isActive = $parent.hasClass('open')
isActive = $parent.hasClass('open')
if (!isActive || (isActive && e.keyCode == 27)) { if (!isActive || (isActive && e.keyCode == 27)) {
if (e.which == 27) $parent.find(toggle).focus() if (e.which == 27) $parent.find(toggle).focus()
return $this.click() return $this.click()
} }
$items = $('[role=menu] li:not(.divider):visible a', $parent) var $items = $('[role=menu] li:not(.divider):visible a', $parent)
if (!$items.length) return if (!$items.length) return
index = $items.index($items.filter(':focus')) var index = $items.index($items.filter(':focus'))
if (e.keyCode == 38 && index > 0) index-- // up if (e.keyCode == 38 && index > 0) index-- // up
if (e.keyCode == 40 && index < $items.length - 1) index++ // down if (e.keyCode == 40 && index < $items.length - 1) index++ // down
if (!~index) index = 0 if (!~index) index=0
$items
.eq(index)
.focus()
}
$items.eq(index).focus()
} }
function clearMenus() { function clearMenus() {
$(toggle).each(function () { $(backdrop).remove()
getParent($(this)).removeClass('open') $(toggle).each(function () { getParent($(this)).removeClass('open') })
})
} }
function getParent($this) { function getParent($this) {
var selector = $this.attr('data-target') var selector = $this.attr('data-target')
, $parent
if (!selector) { if (!selector) {
selector = $this.attr('href') selector = $this.attr('href')
selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
} }
$parent = selector && $(selector) var $parent = selector && $(selector)
if (!$parent || !$parent.length) $parent = $this.parent() return $parent && $parent.length ? $parent : $this.parent()
return $parent
} }
/* DROPDOWN PLUGIN DEFINITION // DROPDOWN PLUGIN DEFINITION
* ========================== */ // ==========================
var old = $.fn.dropdown var old = $.fn.dropdown
$.fn.dropdown = function (option) { $.fn.dropdown = function (option) {
return this.each(function () { return this.each(function () {
var $this = $(this) var $this = $(this)
, data = $this.data('dropdown') var data = $this.data('dropdown')
if (!data) $this.data('dropdown', (data = new Dropdown(this))) if (!data) $this.data('dropdown', (data = new Dropdown(this)))
if (typeof option == 'string') data[option].call($this) if (typeof option == 'string') data[option].call($this)
}) })
@ -763,8 +727,8 @@
$.fn.dropdown.Constructor = Dropdown $.fn.dropdown.Constructor = Dropdown
/* DROPDOWN NO CONFLICT // DROPDOWN NO CONFLICT
* ==================== */ // ====================
$.fn.dropdown.noConflict = function () { $.fn.dropdown.noConflict = function () {
$.fn.dropdown = old $.fn.dropdown = old
@ -772,13 +736,12 @@
} }
/* APPLY TO STANDARD DROPDOWN ELEMENTS // APPLY TO STANDARD DROPDOWN ELEMENTS
* =================================== */ // ===================================
$(document) $(document)
.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)

2
docs/assets/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

84
docs/assets/js/collapse.js
View File

@ -18,48 +18,38 @@
* ============================================================ */ * ============================================================ */
!function ($) { !function ($) { "use strict";
"use strict"; // jshint ;_; // COLLAPSE PUBLIC CLASS DEFINITION
// ================================
/* COLLAPSE PUBLIC CLASS DEFINITION
* ================================ */
var Collapse = function (element, options) { var Collapse = function (element, options) {
this.$element = $(element) this.$element = $(element)
this.options = $.extend({}, $.fn.collapse.defaults, options) this.options = $.extend({}, Collapse.DEFAULTS, options)
this.transitioning = null
if (this.options.parent) { if (this.options.parent) this.$parent = $(this.options.parent)
this.$parent = $(this.options.parent) if (this.options.toggle) this.toggle()
} }
this.options.toggle && this.toggle() Collapse.DEFAULTS = {
toggle: true
} }
Collapse.prototype = { Collapse.prototype.dimension = function () {
constructor: Collapse
, dimension: function () {
var hasWidth = this.$element.hasClass('width') var hasWidth = this.$element.hasClass('width')
return hasWidth ? 'width' : 'height' return hasWidth ? 'width' : 'height'
} }
, show: function () { Collapse.prototype.show = function () {
var dimension
, scroll
, actives
, hasData
if (this.transitioning || this.$element.hasClass('in')) return if (this.transitioning || this.$element.hasClass('in')) return
dimension = this.dimension() var dimension = this.dimension()
scroll = $.camelCase(['scroll', dimension].join('-')) var scroll = $.camelCase(['scroll', dimension].join('-'))
actives = this.$parent && this.$parent.find('> .accordion-group > .in') var actives = this.$parent && this.$parent.find('> .accordion-group > .in')
if (actives && actives.length) { if (actives && actives.length) {
hasData = actives.data('collapse') var hasData = actives.data('collapse')
if (hasData && hasData.transitioning) return if (hasData && hasData.transitioning) return
actives.collapse('hide') actives.collapse('hide')
hasData || actives.data('collapse', null) hasData || actives.data('collapse', null)
@ -67,19 +57,19 @@
this.$element[dimension](0) this.$element[dimension](0)
this.transition('addClass', $.Event('show'), 'shown') this.transition('addClass', $.Event('show'), 'shown')
$.support.transition && this.$element[dimension](this.$element[0][scroll])
if ($.support.transition) this.$element[dimension](this.$element[0][scroll])
} }
, hide: function () { Collapse.prototype.hide = function () {
var dimension
if (this.transitioning || !this.$element.hasClass('in')) return if (this.transitioning || !this.$element.hasClass('in')) return
dimension = this.dimension() var dimension = this.dimension()
this.reset(this.$element[dimension]()) this.reset(this.$element[dimension]())
this.transition('removeClass', $.Event('hide'), 'hidden') this.transition('removeClass', $.Event('hide'), 'hidden')
this.$element[dimension](0) this.$element[dimension](0)
} }
, reset: function (size) { Collapse.prototype.reset = function (size) {
var dimension = this.dimension() var dimension = this.dimension()
this.$element this.$element
@ -92,9 +82,9 @@
return this return this
} }
, transition: function (method, startEvent, completeEvent) { Collapse.prototype.transition = function (method, startEvent, completeEvent) {
var that = this var that = this
, complete = function () { var complete = function () {
if (startEvent.type == 'show') that.reset() if (startEvent.type == 'show') that.reset()
that.transitioning = 0 that.transitioning = 0
that.$element.trigger(completeEvent) that.$element.trigger(completeEvent)
@ -113,37 +103,32 @@
complete() complete()
} }
, toggle: function () { Collapse.prototype.toggle = function () {
this[this.$element.hasClass('in') ? 'hide' : 'show']() this[this.$element.hasClass('in') ? 'hide' : 'show']()
} }
}
// COLLAPSE PLUGIN DEFINITION
/* COLLAPSE PLUGIN DEFINITION // ==========================
* ========================== */
var old = $.fn.collapse var old = $.fn.collapse
$.fn.collapse = function (option) { $.fn.collapse = function (option) {
return this.each(function () { return this.each(function () {
var $this = $(this) var $this = $(this)
, data = $this.data('collapse') var data = $this.data('collapse')
, options = $.extend({}, $.fn.collapse.defaults, $this.data(), typeof option == 'object' && option) var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
if (!data) $this.data('collapse', (data = new Collapse(this, options))) if (!data) $this.data('collapse', (data = new Collapse(this, options)))
if (typeof option == 'string') data[option]() if (typeof option == 'string') data[option]()
}) })
} }
$.fn.collapse.defaults = {
toggle: true
}
$.fn.collapse.Constructor = Collapse $.fn.collapse.Constructor = Collapse
/* COLLAPSE NO CONFLICT // COLLAPSE NO CONFLICT
* ==================== */ // ====================
$.fn.collapse.noConflict = function () { $.fn.collapse.noConflict = function () {
$.fn.collapse = old $.fn.collapse = old
@ -151,15 +136,16 @@
} }
/* COLLAPSE DATA-API // COLLAPSE DATA-API
* ================= */ // =================
$(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) { $(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) {
var $this = $(this), href var $this = $(this), href
, target = $this.attr('data-target') var target = $this.attr('data-target')
|| e.preventDefault() || e.preventDefault()
|| (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
, option = $(target).data('collapse') ? 'toggle' : $this.data() var option = $(target).data('collapse') ? 'toggle' : $this.data()
$this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed') $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
$(target).collapse(option) $(target).collapse(option)
}) })

83
docs/assets/js/dropdown.js
View File

@ -18,40 +18,33 @@
* ============================================================ */ * ============================================================ */
!function ($) { !function ($) { "use strict";
"use strict"; // jshint ;_;
/* DROPDOWN CLASS DEFINITION // DROPDOWN CLASS DEFINITION
* ========================= */ // =========================
var backdrop = '.dropdown-backdrop'
var toggle = '[data-toggle=dropdown]' var toggle = '[data-toggle=dropdown]'
, Dropdown = function (element) { var Dropdown = function (element) {
var $el = $(element).on('click.dropdown.data-api', this.toggle) var $el = $(element).on('click.dropdown.data-api', this.toggle)
$('html').on('click.dropdown.data-api', function () { $('html').on('click.dropdown.data-api', function () {
$el.parent().removeClass('open') $el.parent().removeClass('open')
}) })
} }
Dropdown.prototype = { Dropdown.prototype.toggle = function (e) {
constructor: Dropdown
, toggle: function (e) {
var $this = $(this) var $this = $(this)
, $parent
, isActive
if ($this.is('.disabled, :disabled')) return if ($this.is('.disabled, :disabled')) return
$parent = getParent($this) var $parent = getParent($this)
var isActive = $parent.hasClass('open')
isActive = $parent.hasClass('open')
clearMenus() clearMenus()
if (!isActive) { if (!isActive) {
$('<div class="dropdown-backdrop"/>').insertBefore($(this)).on('click', clearMenus)
$parent.toggleClass('open') $parent.toggleClass('open')
} }
@ -60,81 +53,66 @@
return false return false
} }
, keydown: function (e) { Dropdown.prototype.keydown = function (e) {
var $this
, $items
, $active
, $parent
, isActive
, index
if (!/(38|40|27)/.test(e.keyCode)) return if (!/(38|40|27)/.test(e.keyCode)) return
$this = $(this) var $this = $(this)
e.preventDefault() e.preventDefault()
e.stopPropagation() e.stopPropagation()
if ($this.is('.disabled, :disabled')) return if ($this.is('.disabled, :disabled')) return
$parent = getParent($this) var $parent = getParent($this)
var isActive = $parent.hasClass('open')
isActive = $parent.hasClass('open')
if (!isActive || (isActive && e.keyCode == 27)) { if (!isActive || (isActive && e.keyCode == 27)) {
if (e.which == 27) $parent.find(toggle).focus() if (e.which == 27) $parent.find(toggle).focus()
return $this.click() return $this.click()
} }
$items = $('[role=menu] li:not(.divider):visible a', $parent) var $items = $('[role=menu] li:not(.divider):visible a', $parent)
if (!$items.length) return if (!$items.length) return
index = $items.index($items.filter(':focus')) var index = $items.index($items.filter(':focus'))
if (e.keyCode == 38 && index > 0) index-- // up if (e.keyCode == 38 && index > 0) index-- // up
if (e.keyCode == 40 && index < $items.length - 1) index++ // down if (e.keyCode == 40 && index < $items.length - 1) index++ // down
if (!~index) index = 0 if (!~index) index=0
$items
.eq(index)
.focus()
}
$items.eq(index).focus()
} }
function clearMenus() { function clearMenus() {
$(toggle).each(function () { $(backdrop).remove()
getParent($(this)).removeClass('open') $(toggle).each(function () { getParent($(this)).removeClass('open') })
})
} }
function getParent($this) { function getParent($this) {
var selector = $this.attr('data-target') var selector = $this.attr('data-target')
, $parent
if (!selector) { if (!selector) {
selector = $this.attr('href') selector = $this.attr('href')
selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
} }
$parent = selector && $(selector) var $parent = selector && $(selector)
if (!$parent || !$parent.length) $parent = $this.parent() return $parent && $parent.length ? $parent : $this.parent()
return $parent
} }
/* DROPDOWN PLUGIN DEFINITION // DROPDOWN PLUGIN DEFINITION
* ========================== */ // ==========================
var old = $.fn.dropdown var old = $.fn.dropdown
$.fn.dropdown = function (option) { $.fn.dropdown = function (option) {
return this.each(function () { return this.each(function () {
var $this = $(this) var $this = $(this)
, data = $this.data('dropdown') var data = $this.data('dropdown')
if (!data) $this.data('dropdown', (data = new Dropdown(this))) if (!data) $this.data('dropdown', (data = new Dropdown(this)))
if (typeof option == 'string') data[option].call($this) if (typeof option == 'string') data[option].call($this)
}) })
@ -143,8 +121,8 @@
$.fn.dropdown.Constructor = Dropdown $.fn.dropdown.Constructor = Dropdown
/* DROPDOWN NO CONFLICT // DROPDOWN NO CONFLICT
* ==================== */ // ====================
$.fn.dropdown.noConflict = function () { $.fn.dropdown.noConflict = function () {
$.fn.dropdown = old $.fn.dropdown = old
@ -152,13 +130,12 @@
} }
/* APPLY TO STANDARD DROPDOWN ELEMENTS // APPLY TO STANDARD DROPDOWN ELEMENTS
* =================================== */ // ===================================
$(document) $(document)
.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)

6
docs/javascript.html
View File

@ -346,8 +346,8 @@ $('#myModal').on('hidden', function () {
<li class="dropdown"> <li class="dropdown">
<a id="drop1" href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a> <a id="drop1" href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
<ul class="dropdown-menu" role="menu" aria-labelledby="drop1"> <ul class="dropdown-menu" role="menu" aria-labelledby="drop1">
<li role="presentation"><a role="menuitem" tabindex="-1" href="http://google.com">Action</a></li> <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Action</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#anotherAction">Another action</a></li> <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Another action</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#">Something else here</a></li> <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Something else here</a></li>
<li role="presentation" class="divider"></li> <li role="presentation" class="divider"></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#">Separated link</a></li> <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Separated link</a></li>
@ -412,7 +412,7 @@ $('#myModal').on('hidden', function () {
<li role="presentation"><a role="menuitem" tabindex="-1" href="#">Another action</a></li> <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Another action</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#">Something else here</a></li> <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Something else here</a></li>
<li role="presentation" class="divider"></li> <li role="presentation" class="divider"></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#">Separated link</a></li> <li role="presentation"><a role="menuitem" tabindex="-1" href="http://google.com">Separated link</a></li>
</ul> </ul>
</li> </li>
</ul> <!-- /tabs --> </ul> <!-- /tabs -->

83
js/dropdown.js
View File

@ -18,40 +18,33 @@
* ============================================================ */ * ============================================================ */
!function ($) { !function ($) { "use strict";
"use strict"; // jshint ;_;
/* DROPDOWN CLASS DEFINITION // DROPDOWN CLASS DEFINITION
* ========================= */ // =========================
var backdrop = '.dropdown-backdrop'
var toggle = '[data-toggle=dropdown]' var toggle = '[data-toggle=dropdown]'
, Dropdown = function (element) { var Dropdown = function (element) {
var $el = $(element).on('click.dropdown.data-api', this.toggle) var $el = $(element).on('click.dropdown.data-api', this.toggle)
$('html').on('click.dropdown.data-api', function () { $('html').on('click.dropdown.data-api', function () {
$el.parent().removeClass('open') $el.parent().removeClass('open')
}) })
} }
Dropdown.prototype = { Dropdown.prototype.toggle = function (e) {
constructor: Dropdown
, toggle: function (e) {
var $this = $(this) var $this = $(this)
, $parent
, isActive
if ($this.is('.disabled, :disabled')) return if ($this.is('.disabled, :disabled')) return
$parent = getParent($this) var $parent = getParent($this)
var isActive = $parent.hasClass('open')
isActive = $parent.hasClass('open')
clearMenus() clearMenus()
if (!isActive) { if (!isActive) {
$('<div class="dropdown-backdrop"/>').insertBefore($(this)).on('click', clearMenus)
$parent.toggleClass('open') $parent.toggleClass('open')
} }
@ -60,81 +53,66 @@
return false return false
} }
, keydown: function (e) { Dropdown.prototype.keydown = function (e) {
var $this
, $items
, $active
, $parent
, isActive
, index
if (!/(38|40|27)/.test(e.keyCode)) return if (!/(38|40|27)/.test(e.keyCode)) return
$this = $(this) var $this = $(this)
e.preventDefault() e.preventDefault()
e.stopPropagation() e.stopPropagation()
if ($this.is('.disabled, :disabled')) return if ($this.is('.disabled, :disabled')) return
$parent = getParent($this) var $parent = getParent($this)
var isActive = $parent.hasClass('open')
isActive = $parent.hasClass('open')
if (!isActive || (isActive && e.keyCode == 27)) { if (!isActive || (isActive && e.keyCode == 27)) {
if (e.which == 27) $parent.find(toggle).focus() if (e.which == 27) $parent.find(toggle).focus()
return $this.click() return $this.click()
} }
$items = $('[role=menu] li:not(.divider):visible a', $parent) var $items = $('[role=menu] li:not(.divider):visible a', $parent)
if (!$items.length) return if (!$items.length) return
index = $items.index($items.filter(':focus')) var index = $items.index($items.filter(':focus'))
if (e.keyCode == 38 && index > 0) index-- // up if (e.keyCode == 38 && index > 0) index-- // up
if (e.keyCode == 40 && index < $items.length - 1) index++ // down if (e.keyCode == 40 && index < $items.length - 1) index++ // down
if (!~index) index = 0 if (!~index) index=0
$items
.eq(index)
.focus()
}
$items.eq(index).focus()
} }
function clearMenus() { function clearMenus() {
$(toggle).each(function () { $(backdrop).remove()
getParent($(this)).removeClass('open') $(toggle).each(function () { getParent($(this)).removeClass('open') })
})
} }
function getParent($this) { function getParent($this) {
var selector = $this.attr('data-target') var selector = $this.attr('data-target')
, $parent
if (!selector) { if (!selector) {
selector = $this.attr('href') selector = $this.attr('href')
selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
} }
$parent = selector && $(selector) var $parent = selector && $(selector)
if (!$parent || !$parent.length) $parent = $this.parent() return $parent && $parent.length ? $parent : $this.parent()
return $parent
} }
/* DROPDOWN PLUGIN DEFINITION // DROPDOWN PLUGIN DEFINITION
* ========================== */ // ==========================
var old = $.fn.dropdown var old = $.fn.dropdown
$.fn.dropdown = function (option) { $.fn.dropdown = function (option) {
return this.each(function () { return this.each(function () {
var $this = $(this) var $this = $(this)
, data = $this.data('dropdown') var data = $this.data('dropdown')
if (!data) $this.data('dropdown', (data = new Dropdown(this))) if (!data) $this.data('dropdown', (data = new Dropdown(this)))
if (typeof option == 'string') data[option].call($this) if (typeof option == 'string') data[option].call($this)
}) })
@ -143,8 +121,8 @@
$.fn.dropdown.Constructor = Dropdown $.fn.dropdown.Constructor = Dropdown
/* DROPDOWN NO CONFLICT // DROPDOWN NO CONFLICT
* ==================== */ // ====================
$.fn.dropdown.noConflict = function () { $.fn.dropdown.noConflict = function () {
$.fn.dropdown = old $.fn.dropdown = old
@ -152,13 +130,12 @@
} }
/* APPLY TO STANDARD DROPDOWN ELEMENTS // APPLY TO STANDARD DROPDOWN ELEMENTS
* =================================== */ // ===================================
$(document) $(document)
.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)

6
js/tests/unit/dropdown.js
View File

@ -104,7 +104,7 @@ $(function () {
.dropdown() .dropdown()
.click() .click()
ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click') ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
$('body').click() $('.dropdown-backdrop').click()
ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class removed') ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class removed')
dropdown.remove() dropdown.remove()
}) })
@ -136,13 +136,13 @@ $(function () {
first.click() first.click()
ok(first.parents('.open').length == 1, 'open class added on click') ok(first.parents('.open').length == 1, 'open class added on click')
ok($('#qunit-fixture .open').length == 1, 'only one object is open') ok($('#qunit-fixture .open').length == 1, 'only one object is open')
$('body').click() $('.dropdown-backdrop').click()
ok($("#qunit-fixture .open").length === 0, 'open class removed') ok($("#qunit-fixture .open").length === 0, 'open class removed')
last.click() last.click()
ok(last.parent('.open').length == 1, 'open class added on click') ok(last.parent('.open').length == 1, 'open class added on click')
ok($('#qunit-fixture .open').length == 1, 'only one object is open') ok($('#qunit-fixture .open').length == 1, 'only one object is open')
$('body').click() $('.dropdown-backdrop').click()
ok($("#qunit-fixture .open").length === 0, 'open class removed') ok($("#qunit-fixture .open").length === 0, 'open class removed')
$("#qunit-fixture").html("") $("#qunit-fixture").html("")

12
less/dropdowns.less
View File

@ -114,6 +114,18 @@
} }
} }
// Backdrop to catch body clicks on mobile, etc.
// ---------------------------
.dropdown-backdrop {
position: fixed;
left: 0;
right: 0;
bottom: 0;
top: 0;
z-index: @zindex-dropdown - 10;
}
// Right aligned dropdowns // Right aligned dropdowns
// --------------------------- // ---------------------------
.pull-right > .dropdown-menu { .pull-right > .dropdown-menu {