mirror of
https://github.com/twbs/bootstrap.git
synced 2022-11-09 12:25:43 -05:00
start updating to data- driven js
This commit is contained in:
parent
913338f930
commit
a91a407bd6
6 changed files with 80 additions and 52 deletions
6
js/bootstrap-alerts.js
vendored
6
js/bootstrap-alerts.js
vendored
|
@ -53,7 +53,7 @@
|
||||||
|
|
||||||
var Alert = function ( content, selector ) {
|
var Alert = function ( content, selector ) {
|
||||||
this.$element = $(content)
|
this.$element = $(content)
|
||||||
.delegate(selector || '.close', 'click', this.close)
|
.delegate('[data-alert-dismiss]', 'click', this.close)
|
||||||
}
|
}
|
||||||
|
|
||||||
Alert.prototype = {
|
Alert.prototype = {
|
||||||
|
@ -62,6 +62,8 @@
|
||||||
var $element = $(this).parent('.alert-message')
|
var $element = $(this).parent('.alert-message')
|
||||||
|
|
||||||
e && e.preventDefault()
|
e && e.preventDefault()
|
||||||
|
e && e.stopPropagation()
|
||||||
|
|
||||||
$element.removeClass('in')
|
$element.removeClass('in')
|
||||||
|
|
||||||
function removeElement () {
|
function removeElement () {
|
||||||
|
@ -98,7 +100,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
new Alert($('body'), '.alert-message[data-alert] .close')
|
new Alert($('body'))
|
||||||
})
|
})
|
||||||
|
|
||||||
})( window.jQuery || window.ender )
|
})( window.jQuery || window.ender )
|
27
js/bootstrap-dropdown.js
vendored
27
js/bootstrap-dropdown.js
vendored
|
@ -20,23 +20,14 @@
|
||||||
|
|
||||||
(function( $ ){
|
(function( $ ){
|
||||||
|
|
||||||
var d = '.dropdown-toggle'
|
var d = '[data-dropdown]'
|
||||||
|
|
||||||
function clearMenus() {
|
|
||||||
$(d).parent('li').removeClass('open')
|
|
||||||
}
|
|
||||||
|
|
||||||
$(function () {
|
|
||||||
$('html').bind("click", clearMenus)
|
|
||||||
$('body').dropdown( '[data-dropdown] .dropdown-toggle' )
|
|
||||||
})
|
|
||||||
|
|
||||||
/* DROPDOWN PLUGIN DEFINITION
|
/* DROPDOWN PLUGIN DEFINITION
|
||||||
* ========================== */
|
* ========================== */
|
||||||
|
|
||||||
$.fn.dropdown = function ( selector ) {
|
$.fn.dropdown = function () {
|
||||||
return this.each(function () {
|
return this.each(function () {
|
||||||
$(this).delegate(selector || d, 'click', function (e) {
|
$(this).delegate(d, 'click', function (e) {
|
||||||
var li = $(this).parent('li')
|
var li = $(this).parent('li')
|
||||||
, isActive = li.hasClass('open')
|
, isActive = li.hasClass('open')
|
||||||
|
|
||||||
|
@ -47,4 +38,16 @@
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* APPLY TO STANDARD DROPDOWN ELEMENTS
|
||||||
|
* =================================== */
|
||||||
|
|
||||||
|
function clearMenus() {
|
||||||
|
$(d).parent('li').removeClass('open')
|
||||||
|
}
|
||||||
|
|
||||||
|
$(function () {
|
||||||
|
$('html').bind("click", clearMenus)
|
||||||
|
$('body').dropdown()
|
||||||
|
})
|
||||||
|
|
||||||
})( window.jQuery || window.ender )
|
})( window.jQuery || window.ender )
|
63
js/bootstrap-modal.js
vendored
63
js/bootstrap-modal.js
vendored
|
@ -18,7 +18,7 @@
|
||||||
* ========================================================= */
|
* ========================================================= */
|
||||||
|
|
||||||
|
|
||||||
(function( $ ){
|
!function( $ ){
|
||||||
|
|
||||||
/* CSS TRANSITION SUPPORT (https://gist.github.com/373874)
|
/* CSS TRANSITION SUPPORT (https://gist.github.com/373874)
|
||||||
* ======================================================= */
|
* ======================================================= */
|
||||||
|
@ -53,17 +53,13 @@
|
||||||
* ============================= */
|
* ============================= */
|
||||||
|
|
||||||
var Modal = function ( content, options ) {
|
var Modal = function ( content, options ) {
|
||||||
this.settings = $.extend({}, $.fn.modal.defaults)
|
this.settings = $.extend({}, $.fn.modal.defaults, options)
|
||||||
this.$element = $(content)
|
this.$element = $(content)
|
||||||
.delegate('.js-dismiss', 'click.modal', $.proxy(this.hide, this))
|
.delegate('[data-modal-dismiss]', $.proxy(this.hide, this))
|
||||||
|
|
||||||
if ( options ) {
|
if ( this.settings.show ) {
|
||||||
$.extend( this.settings, options )
|
|
||||||
|
|
||||||
if ( options.show ) {
|
|
||||||
this.show()
|
this.show()
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return this
|
return this
|
||||||
}
|
}
|
||||||
|
@ -81,15 +77,23 @@
|
||||||
|
|
||||||
escape.call(this)
|
escape.call(this)
|
||||||
backdrop.call(this, function () {
|
backdrop.call(this, function () {
|
||||||
|
var transition = $.support.transition && that.$element.hasClass('fade')
|
||||||
|
|
||||||
that.$element
|
that.$element
|
||||||
.appendTo(document.body)
|
.appendTo(document.body)
|
||||||
.show()
|
.show()
|
||||||
|
|
||||||
setTimeout(function () {
|
if (transition) {
|
||||||
|
that.$element[0].offsetWidth // force reflow
|
||||||
|
}
|
||||||
|
|
||||||
that.$element
|
that.$element
|
||||||
.addClass('in')
|
.addClass('in')
|
||||||
.trigger('shown')
|
|
||||||
}, 1)
|
transition ?
|
||||||
|
that.$element.one(transitionEnd, function () { that.$element.trigger('shown') }) :
|
||||||
|
that.$element.trigger('shown')
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
||||||
return this
|
return this
|
||||||
|
@ -98,6 +102,10 @@
|
||||||
, hide: function (e) {
|
, hide: function (e) {
|
||||||
e && e.preventDefault()
|
e && e.preventDefault()
|
||||||
|
|
||||||
|
if ( !this.isShown ) {
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
|
||||||
var that = this
|
var that = this
|
||||||
this.isShown = false
|
this.isShown = false
|
||||||
|
|
||||||
|
@ -132,16 +140,25 @@
|
||||||
var that = this
|
var that = this
|
||||||
, animate = this.$element.hasClass('fade') ? 'fade' : ''
|
, animate = this.$element.hasClass('fade') ? 'fade' : ''
|
||||||
if ( this.isShown && this.settings.backdrop ) {
|
if ( this.isShown && this.settings.backdrop ) {
|
||||||
|
var doAnimate = $.support.transition && animate
|
||||||
|
|
||||||
this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
|
this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
|
||||||
.click($.proxy(this.hide, this))
|
|
||||||
.appendTo(document.body)
|
.appendTo(document.body)
|
||||||
|
|
||||||
setTimeout(function () {
|
if ( this.settings.backdrop != 'static' ) {
|
||||||
that.$backdrop && that.$backdrop.addClass('in')
|
this.$backdrop.click($.proxy(this.hide, this))
|
||||||
$.support.transition && that.$backdrop.hasClass('fade') ?
|
}
|
||||||
that.$backdrop.one(transitionEnd, callback) :
|
|
||||||
|
if ( doAnimate ) {
|
||||||
|
this.$backdrop[0].offsetWidth // force reflow
|
||||||
|
}
|
||||||
|
|
||||||
|
this.$backdrop.addClass('in')
|
||||||
|
|
||||||
|
doAnimate ?
|
||||||
|
this.$backdrop.one(transitionEnd, callback) :
|
||||||
callback()
|
callback()
|
||||||
})
|
|
||||||
} else if ( !this.isShown && this.$backdrop ) {
|
} else if ( !this.isShown && this.$backdrop ) {
|
||||||
this.$backdrop.removeClass('in')
|
this.$backdrop.removeClass('in')
|
||||||
|
|
||||||
|
@ -161,13 +178,13 @@
|
||||||
function escape() {
|
function escape() {
|
||||||
var that = this
|
var that = this
|
||||||
if ( this.isShown && this.settings.keyboard ) {
|
if ( this.isShown && this.settings.keyboard ) {
|
||||||
$('body').bind('keyup.modal', function ( e ) {
|
$(document).bind('keyup.modal', function ( e ) {
|
||||||
if ( e.which == 27 ) {
|
if ( e.which == 27 ) {
|
||||||
that.hide()
|
that.hide()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
} else if ( !this.isShown ) {
|
} else if ( !this.isShown ) {
|
||||||
$('body').unbind('keyup.modal')
|
$(document).unbind('keyup.modal')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -209,12 +226,12 @@
|
||||||
$.fn.modal.defaults = {
|
$.fn.modal.defaults = {
|
||||||
backdrop: false
|
backdrop: false
|
||||||
, keyboard: false
|
, keyboard: false
|
||||||
, show: true
|
, show: false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* MODAL DATA- IMPLEMENTATION
|
/* MODAL DATA-IMPLEMENTATION
|
||||||
* ========================== */
|
* ========================= */
|
||||||
|
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
$('body').delegate('[data-controls-modal]', 'click', function (e) {
|
$('body').delegate('[data-controls-modal]', 'click', function (e) {
|
||||||
|
@ -224,4 +241,4 @@
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
})( window.jQuery || window.ender )
|
}( window.jQuery || window.ender );
|
6
js/bootstrap-popover.js
vendored
6
js/bootstrap-popover.js
vendored
|
@ -18,7 +18,7 @@
|
||||||
* =========================================================== */
|
* =========================================================== */
|
||||||
|
|
||||||
|
|
||||||
(function( $ ) {
|
!function( $ ) {
|
||||||
|
|
||||||
var Popover = function ( element, options ) {
|
var Popover = function ( element, options ) {
|
||||||
this.$element = $(element)
|
this.$element = $(element)
|
||||||
|
@ -40,7 +40,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
, getContent: function () {
|
, getContent: function () {
|
||||||
var contentvar
|
var content
|
||||||
, $e = this.$element
|
, $e = this.$element
|
||||||
, o = this.options
|
, o = this.options
|
||||||
|
|
||||||
|
@ -74,4 +74,4 @@
|
||||||
|
|
||||||
$.fn.popover.defaults = $.extend({} , $.fn.twipsy.defaults, { content: 'data-content', placement: 'right'})
|
$.fn.popover.defaults = $.extend({} , $.fn.twipsy.defaults, { content: 'data-content', placement: 'right'})
|
||||||
|
|
||||||
})( window.jQuery || window.ender )
|
}( window.jQuery || window.ender );
|
18
js/bootstrap-tabs.js
vendored
18
js/bootstrap-tabs.js
vendored
|
@ -18,30 +18,36 @@
|
||||||
* ======================================================== */
|
* ======================================================== */
|
||||||
|
|
||||||
|
|
||||||
(function( $ ){
|
!function( $ ){
|
||||||
|
|
||||||
function activate ( element, container ) {
|
function activate ( element, container ) {
|
||||||
container.find('.active').removeClass('active')
|
container.find('> .active').removeClass('active')
|
||||||
element.addClass('active')
|
element.addClass('active')
|
||||||
}
|
}
|
||||||
|
|
||||||
function tab( e ) {
|
function tab( e ) {
|
||||||
var $this = $(this)
|
var $this = $(this)
|
||||||
|
, $ul = $this.closest('ul')
|
||||||
, href = $this.attr('href')
|
, href = $this.attr('href')
|
||||||
, $ul = $(e.liveFired)
|
, previous
|
||||||
, $controlled
|
|
||||||
|
|
||||||
if (/^#\w+/.test(href)) {
|
if (/^#\w+/.test(href)) {
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
|
|
||||||
if ($this.hasClass('active')) {
|
if ($this.parent('li').hasClass('active')) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
previous = $ul.find('.active a')[0]
|
||||||
$href = $(href)
|
$href = $(href)
|
||||||
|
|
||||||
activate($this.parent('li'), $ul)
|
activate($this.parent('li'), $ul)
|
||||||
activate($href, $href.parent())
|
activate($href, $href.parent())
|
||||||
|
|
||||||
|
$this.trigger({
|
||||||
|
type: 'change'
|
||||||
|
, relatedTarget: previous
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -59,4 +65,4 @@
|
||||||
$('body').tabs('ul[data-tabs] li > a, ul[data-pills] > li > a')
|
$('body').tabs('ul[data-tabs] li > a, ul[data-pills] > li > a')
|
||||||
})
|
})
|
||||||
|
|
||||||
})( window.jQuery || window.ender )
|
}( window.jQuery || window.ender );
|
4
js/bootstrap-twipsy.js
vendored
4
js/bootstrap-twipsy.js
vendored
|
@ -19,7 +19,7 @@
|
||||||
* ========================================================== */
|
* ========================================================== */
|
||||||
|
|
||||||
|
|
||||||
(function( $ ) {
|
!function( $ ) {
|
||||||
|
|
||||||
/* CSS TRANSITION SUPPORT (https://gist.github.com/373874)
|
/* CSS TRANSITION SUPPORT (https://gist.github.com/373874)
|
||||||
* ======================================================= */
|
* ======================================================= */
|
||||||
|
@ -304,4 +304,4 @@
|
||||||
return $.metadata ? $.extend({}, options, $(ele).metadata()) : options
|
return $.metadata ? $.extend({}, options, $(ele).metadata()) : options
|
||||||
}
|
}
|
||||||
|
|
||||||
})( window.jQuery || window.ender )
|
}( window.jQuery || window.ender );
|
Loading…
Add table
Reference in a new issue