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

Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip

This commit is contained in:
Mark Otto 2012-04-15 16:48:26 -07:00
parent d374fe92e5 0b8042656f
commit b67a2d8a59
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/assets/js/bootstrap-alert.js vendored
View File

@ -27,7 +27,7 @@
* ====================== */
var dismiss = '[data-dismiss="alert"]'
, Alert = function ( el ) {
, Alert = function (el) {
$(el).on('click', dismiss, this.close)
}
@ -68,7 +68,7 @@
/* ALERT PLUGIN DEFINITION
* ======================= */
$.fn.alert = function ( option ) {
$.fn.alert = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('alert')

1
docs/assets/js/bootstrap-collapse.js vendored
View File

@ -60,6 +60,7 @@
if (actives && actives.length) {
hasData = actives.data('collapse')
if (hasData && hasData.transitioning) return
actives.collapse('hide')
hasData || actives.data('collapse', null)
}

4
js/bootstrap-alert.js vendored
View File

@ -27,7 +27,7 @@
* ====================== */
var dismiss = '[data-dismiss="alert"]'
, Alert = function ( el ) {
, Alert = function (el) {
$(el).on('click', dismiss, this.close)
}
@ -68,7 +68,7 @@
/* ALERT PLUGIN DEFINITION
* ======================= */
$.fn.alert = function ( option ) {
$.fn.alert = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('alert')

1
js/bootstrap-collapse.js vendored
View File

@ -60,6 +60,7 @@
if (actives && actives.length) {
hasData = actives.data('collapse')
if (hasData && hasData.transitioning) return
actives.collapse('hide')
hasData || actives.data('collapse', null)
}