0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00

update collapse js style

This commit is contained in:
fat 2013-05-16 11:20:18 -07:00
parent a4c16155a2
commit bdbd268cb9

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)
}) })