diff --git a/js/bootstrap-alerts.js b/js/bootstrap-alerts.js
index 82bcac5246e3862f230447705cd2995d56e30ceb..4498270cb9eb0b23512756a56009a3de3800c9c5 100644
--- a/js/bootstrap-alerts.js
+++ b/js/bootstrap-alerts.js
@@ -53,7 +53,7 @@
var Alert = function ( content, selector ) {
this.$element = $(content)
- .delegate(selector || '.close', 'click', this.close)
+ .delegate('[data-alert-dismiss]', 'click', this.close)
}
Alert.prototype = {
@@ -62,6 +62,8 @@
var $element = $(this).parent('.alert-message')
e && e.preventDefault()
+ e && e.stopPropagation()
+
$element.removeClass('in')
function removeElement () {
@@ -98,7 +100,7 @@
}
$(document).ready(function () {
- new Alert($('body'), '.alert-message[data-alert] .close')
+ new Alert($('body'))
})
})( window.jQuery || window.ender )
\ No newline at end of file
diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js
index 75320c0f876b59853babf944569b0af6714d9340..6379653c56aeaa53241ab8e37a962acc15545aa9 100644
--- a/js/bootstrap-dropdown.js
+++ b/js/bootstrap-dropdown.js
@@ -20,23 +20,14 @@
(function( $ ){
- var d = '.dropdown-toggle'
-
- function clearMenus() {
- $(d).parent('li').removeClass('open')
- }
-
- $(function () {
- $('html').bind("click", clearMenus)
- $('body').dropdown( '[data-dropdown] .dropdown-toggle' )
- })
+ var d = '[data-dropdown]'
/* DROPDOWN PLUGIN DEFINITION
* ========================== */
- $.fn.dropdown = function ( selector ) {
+ $.fn.dropdown = function () {
return this.each(function () {
- $(this).delegate(selector || d, 'click', function (e) {
+ $(this).delegate(d, 'click', function (e) {
var li = $(this).parent('li')
, 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 )
\ No newline at end of file
diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js
index 5c38a7477b9863a322f444bbec4acca3a46f8544..c8d41a50b2380d8b8b2221dc448cede467b8891b 100644
--- a/js/bootstrap-modal.js
+++ b/js/bootstrap-modal.js
@@ -18,7 +18,7 @@
* ========================================================= */
-(function( $ ){
+!function( $ ){
/* CSS TRANSITION SUPPORT (https://gist.github.com/373874)
* ======================================================= */
@@ -53,16 +53,12 @@
* ============================= */
var Modal = function ( content, options ) {
- this.settings = $.extend({}, $.fn.modal.defaults)
+ this.settings = $.extend({}, $.fn.modal.defaults, options)
this.$element = $(content)
- .delegate('.js-dismiss', 'click.modal', $.proxy(this.hide, this))
+ .delegate('[data-modal-dismiss]', $.proxy(this.hide, this))
- if ( options ) {
- $.extend( this.settings, options )
-
- if ( options.show ) {
- this.show()
- }
+ if ( this.settings.show ) {
+ this.show()
}
return this
@@ -81,15 +77,23 @@
escape.call(this)
backdrop.call(this, function () {
+ var transition = $.support.transition && that.$element.hasClass('fade')
+
that.$element
.appendTo(document.body)
.show()
- setTimeout(function () {
- that.$element
- .addClass('in')
- .trigger('shown')
- }, 1)
+ if (transition) {
+ that.$element[0].offsetWidth // force reflow
+ }
+
+ that.$element
+ .addClass('in')
+
+ transition ?
+ that.$element.one(transitionEnd, function () { that.$element.trigger('shown') }) :
+ that.$element.trigger('shown')
+
})
return this
@@ -98,6 +102,10 @@
, hide: function (e) {
e && e.preventDefault()
+ if ( !this.isShown ) {
+ return this
+ }
+
var that = this
this.isShown = false
@@ -132,16 +140,25 @@
var that = this
, animate = this.$element.hasClass('fade') ? 'fade' : ''
if ( this.isShown && this.settings.backdrop ) {
+ var doAnimate = $.support.transition && animate
+
this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
- .click($.proxy(this.hide, this))
.appendTo(document.body)
- setTimeout(function () {
- that.$backdrop && that.$backdrop.addClass('in')
- $.support.transition && that.$backdrop.hasClass('fade') ?
- that.$backdrop.one(transitionEnd, callback) :
- callback()
- })
+ if ( this.settings.backdrop != 'static' ) {
+ this.$backdrop.click($.proxy(this.hide, this))
+ }
+
+ if ( doAnimate ) {
+ this.$backdrop[0].offsetWidth // force reflow
+ }
+
+ this.$backdrop.addClass('in')
+
+ doAnimate ?
+ this.$backdrop.one(transitionEnd, callback) :
+ callback()
+
} else if ( !this.isShown && this.$backdrop ) {
this.$backdrop.removeClass('in')
@@ -161,13 +178,13 @@
function escape() {
var that = this
if ( this.isShown && this.settings.keyboard ) {
- $('body').bind('keyup.modal', function ( e ) {
+ $(document).bind('keyup.modal', function ( e ) {
if ( e.which == 27 ) {
that.hide()
}
})
} else if ( !this.isShown ) {
- $('body').unbind('keyup.modal')
+ $(document).unbind('keyup.modal')
}
}
@@ -209,12 +226,12 @@
$.fn.modal.defaults = {
backdrop: false
, keyboard: false
- , show: true
+ , show: false
}
- /* MODAL DATA- IMPLEMENTATION
- * ========================== */
+ /* MODAL DATA-IMPLEMENTATION
+ * ========================= */
$(document).ready(function () {
$('body').delegate('[data-controls-modal]', 'click', function (e) {
@@ -224,4 +241,4 @@
})
})
-})( window.jQuery || window.ender )
\ No newline at end of file
+}( window.jQuery || window.ender );
\ No newline at end of file
diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js
index e41090a3b3274842c9196bd60b65ece34922e3d8..1cf4b8917ad35c1256ef9676ff1f372e80b2264e 100644
--- a/js/bootstrap-popover.js
+++ b/js/bootstrap-popover.js
@@ -18,7 +18,7 @@
* =========================================================== */
-(function( $ ) {
+!function( $ ) {
var Popover = function ( element, options ) {
this.$element = $(element)
@@ -40,7 +40,7 @@
}
, getContent: function () {
- var contentvar
+ var content
, $e = this.$element
, o = this.options
@@ -74,4 +74,4 @@
$.fn.popover.defaults = $.extend({} , $.fn.twipsy.defaults, { content: 'data-content', placement: 'right'})
-})( window.jQuery || window.ender )
\ No newline at end of file
+}( window.jQuery || window.ender );
\ No newline at end of file
diff --git a/js/bootstrap-tabs.js b/js/bootstrap-tabs.js
index 807b366a354de2f9ab5180b3619ee5d7095a715a..b94adfc25dea86c3ca25c78e1292b1c3fd3de25a 100644
--- a/js/bootstrap-tabs.js
+++ b/js/bootstrap-tabs.js
@@ -18,30 +18,36 @@
* ======================================================== */
-(function( $ ){
+!function( $ ){
function activate ( element, container ) {
- container.find('.active').removeClass('active')
+ container.find('> .active').removeClass('active')
element.addClass('active')
}
function tab( e ) {
var $this = $(this)
+ , $ul = $this.closest('ul')
, href = $this.attr('href')
- , $ul = $(e.liveFired)
- , $controlled
+ , previous
if (/^#\w+/.test(href)) {
e.preventDefault()
- if ($this.hasClass('active')) {
+ if ($this.parent('li').hasClass('active')) {
return
}
+ previous = $ul.find('.active a')[0]
$href = $(href)
activate($this.parent('li'), $ul)
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')
})
-})( window.jQuery || window.ender )
\ No newline at end of file
+}( window.jQuery || window.ender );
\ No newline at end of file
diff --git a/js/bootstrap-twipsy.js b/js/bootstrap-twipsy.js
index bc92f97fe16d572d54e5d64ae78cc36b1845b3f1..0144c48158ae764c837e93f333bbed46601856b2 100644
--- a/js/bootstrap-twipsy.js
+++ b/js/bootstrap-twipsy.js
@@ -19,7 +19,7 @@
* ========================================================== */
-(function( $ ) {
+!function( $ ) {
/* CSS TRANSITION SUPPORT (https://gist.github.com/373874)
* ======================================================= */
@@ -304,4 +304,4 @@
return $.metadata ? $.extend({}, options, $(ele).metadata()) : options
}
-})( window.jQuery || window.ender )
\ No newline at end of file
+}( window.jQuery || window.ender );
\ No newline at end of file