Skip to content

Commit

Permalink
Update JS
Browse files Browse the repository at this point in the history
  • Loading branch information
vwall committed Feb 17, 2012
1 parent 95951b1 commit 06571a5
Show file tree
Hide file tree
Showing 12 changed files with 39 additions and 32 deletions.
13 changes: 8 additions & 5 deletions vendor/assets/javascripts/bootstrap-alert.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ==========================================================
* bootstrap-alert.js v2.0.0
* bootstrap-alert.js v2.0.1
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -51,11 +51,14 @@

$parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())

$parent.removeClass('in')
$parent
.trigger('close')
.removeClass('in')

function removeElement() {
$parent.remove()
$parent.trigger('closed')
$parent
.trigger('closed')
.remove()
}

$.support.transition && $parent.hasClass('fade') ?
Expand Down Expand Up @@ -88,4 +91,4 @@
$('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
})

}( window.jQuery )
}( window.jQuery );
6 changes: 3 additions & 3 deletions vendor/assets/javascripts/bootstrap-button.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ============================================================
* bootstrap-button.js v2.0.0
* bootstrap-button.js v2.0.1
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -91,8 +91,8 @@

$(function () {
$('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) {
$(e.target).button('toggle')
$(e.currentTarget).button('toggle')
})
})

}( window.jQuery )
}( window.jQuery );
7 changes: 5 additions & 2 deletions vendor/assets/javascripts/bootstrap-carousel.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ==========================================================
* bootstrap-carousel.js v2.0.0
* bootstrap-carousel.js v2.0.1
* http://twitter.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -61,6 +61,7 @@

, pause: function () {
clearInterval(this.interval)
this.interval = null
return this
}

Expand All @@ -82,6 +83,8 @@
, fallback = type == 'next' ? 'first' : 'last'
, that = this

if (!$next.length) return

this.sliding = true

isCycling && this.pause()
Expand Down Expand Up @@ -151,4 +154,4 @@
})
})

}( window.jQuery )
}( window.jQuery );
4 changes: 2 additions & 2 deletions vendor/assets/javascripts/bootstrap-collapse.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* =============================================================
* bootstrap-collapse.js v2.0.0
* bootstrap-collapse.js v2.0.1
* http://twitter.github.com/bootstrap/javascript.html#collapse
* =============================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -133,4 +133,4 @@
})
})

}( window.jQuery )
}( window.jQuery );
4 changes: 2 additions & 2 deletions vendor/assets/javascripts/bootstrap-dropdown.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ============================================================
* bootstrap-dropdown.js v2.0.0
* bootstrap-dropdown.js v2.0.1
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -89,4 +89,4 @@
$('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
})

}( window.jQuery )
}( window.jQuery );
11 changes: 6 additions & 5 deletions vendor/assets/javascripts/bootstrap-modal.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* =========================================================
* bootstrap-modal.js v2.0.0
* bootstrap-modal.js v2.0.1
* http://twitter.github.com/bootstrap/javascript.html#modals
* =========================================================
* Copyright 2012 Twitter, Inc.
Expand All @@ -26,7 +26,7 @@
* ====================== */

var Modal = function ( content, options ) {
this.options = $.extend({}, $.fn.modal.defaults, options)
this.options = options
this.$element = $(content)
.delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
}
Expand Down Expand Up @@ -177,16 +177,17 @@
return this.each(function () {
var $this = $(this)
, data = $this.data('modal')
, options = typeof option == 'object' && option
, options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option)
if (!data) $this.data('modal', (data = new Modal(this, options)))
if (typeof option == 'string') data[option]()
else data.show()
else if (options.show) data.show()
})
}

$.fn.modal.defaults = {
backdrop: true
, keyboard: true
, show: true
}

$.fn.modal.Constructor = Modal
Expand All @@ -206,4 +207,4 @@
})
})

}( window.jQuery )
}( window.jQuery );
4 changes: 2 additions & 2 deletions vendor/assets/javascripts/bootstrap-popover.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ===========================================================
* bootstrap-popover.js v2.0.0
* bootstrap-popover.js v2.0.1
* http://twitter.github.com/bootstrap/javascript.html#popovers
* ===========================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -92,4 +92,4 @@
, template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'
})

}( window.jQuery )
}( window.jQuery );
4 changes: 2 additions & 2 deletions vendor/assets/javascripts/bootstrap-scrollspy.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* =============================================================
* bootstrap-scrollspy.js v2.0.0
* bootstrap-scrollspy.js v2.0.1
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -122,4 +122,4 @@
})
})

}( window.jQuery )
}( window.jQuery );
4 changes: 2 additions & 2 deletions vendor/assets/javascripts/bootstrap-tab.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ========================================================
* bootstrap-tab.js v2.0.0
* bootstrap-tab.js v2.0.1
* http://twitter.github.com/bootstrap/javascript.html#tabs
* ========================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -127,4 +127,4 @@
})
})

}( window.jQuery )
}( window.jQuery );
4 changes: 2 additions & 2 deletions vendor/assets/javascripts/bootstrap-tooltip.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ===========================================================
* bootstrap-tooltip.js v2.0.0
* bootstrap-tooltip.js v2.0.1
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================
Expand Down Expand Up @@ -267,4 +267,4 @@
, template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
}

}( window.jQuery )
}( window.jQuery );
6 changes: 3 additions & 3 deletions vendor/assets/javascripts/bootstrap-transition.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ===================================================
* bootstrap-transition.js v2.0.0
* bootstrap-transition.js v2.0.1
* http://twitter.github.com/bootstrap/javascript.html#transitions
* ===================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -47,5 +47,5 @@
})()

})
}( window.jQuery )

}( window.jQuery );
4 changes: 2 additions & 2 deletions vendor/assets/javascripts/bootstrap-typeahead.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* =============================================================
* bootstrap-typeahead.js v2.0.0
* bootstrap-typeahead.js v2.0.1
* http://twitter.github.com/bootstrap/javascript.html#typeahead
* =============================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -268,4 +268,4 @@
})
})

}( window.jQuery )
}( window.jQuery );

0 comments on commit 06571a5

Please sign in to comment.