diff options
| -rw-r--r-- | docs/assets/js/application.js | 2 | ||||
| -rw-r--r-- | js/bootstrap-accordion.js | 41 | ||||
| -rw-r--r-- | js/bootstrap-alerts.js | 80 | ||||
| -rw-r--r-- | js/bootstrap-dropdown.js | 28 | ||||
| -rw-r--r-- | js/bootstrap-modal.js | 81 | ||||
| -rw-r--r-- | js/bootstrap-popover.js | 1 | ||||
| -rw-r--r-- | js/bootstrap-scrollspy.js | 25 | ||||
| -rw-r--r-- | js/bootstrap-tabs.js | 10 | ||||
| -rw-r--r-- | js/bootstrap-transitions.js | 45 | ||||
| -rw-r--r-- | js/bootstrap-twipsy.js | 31 |
10 files changed, 138 insertions, 206 deletions
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 16a20e068e..74024caa1d 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -1,4 +1,4 @@ -$(document).ready(function(){ +$(function(){ // table sort example // ================== diff --git a/js/bootstrap-accordion.js b/js/bootstrap-accordion.js new file mode 100644 index 0000000000..b88057691d --- /dev/null +++ b/js/bootstrap-accordion.js @@ -0,0 +1,41 @@ +/* ============================================================= + * bootstrap-accordion.js v1.3.0 + * http://twitter.github.com/bootstrap/javascript.html#accordion + * ============================================================= + * Copyright 2011 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============================================================ */ + +(function( $ ){ + + var Accordion = function ( element, options ) {} + + Accordion.prototype = {} + + /* ALERT PLUGIN DEFINITION + * ======================= */ + + $.fn.accordion = function ( options ) { + + if ( options === true ) { + return this.data('accordion') + } + + return this.each(function () { + new Accordion(this, options) + }) + } + + +})( window.jQuery || window.ender )
\ No newline at end of file diff --git a/js/bootstrap-alerts.js b/js/bootstrap-alerts.js index 4498270cb9..bac92deb8a 100644 --- a/js/bootstrap-alerts.js +++ b/js/bootstrap-alerts.js @@ -17,90 +17,32 @@ * limitations under the License. * ========================================================== */ - (function( $ ){ - /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) - * ======================================================= */ - - var transitionEnd - - $(document).ready(function () { - - $.support.transition = (function () { - var thisBody = document.body || document.documentElement - , thisStyle = thisBody.style - , support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined - return support - })() - - // set CSS transition event type - if ( $.support.transition ) { - transitionEnd = "TransitionEnd" - if ( $.browser.webkit ) { - transitionEnd = "webkitTransitionEnd" - } else if ( $.browser.mozilla ) { - transitionEnd = "transitionend" - } else if ( $.browser.opera ) { - transitionEnd = "oTransitionEnd" - } - } - - }) - /* ALERT CLASS DEFINITION * ====================== */ - var Alert = function ( content, selector ) { - this.$element = $(content) - .delegate('[data-alert-dismiss]', 'click', this.close) - } - - Alert.prototype = { - - close: function (e) { - var $element = $(this).parent('.alert-message') + function close(e) { + var $element = $(this).parent('.alert-message') - e && e.preventDefault() - e && e.stopPropagation() + e && e.preventDefault() + $element.removeClass('in') - $element.removeClass('in') - - function removeElement () { - $element.remove() - } - - $.support.transition && $element.hasClass('fade') ? - $element.bind(transitionEnd, removeElement) : - removeElement() + function removeElement () { + $element.remove() } + $.support.transition && $element.hasClass('fade') ? + $element.bind($.support.transition.end, removeElement) : + removeElement() } /* ALERT PLUGIN DEFINITION * ======================= */ - $.fn.alert = function ( options ) { - - if ( options === true ) { - return this.data('alert') - } - - return this.each(function () { - var $this = $(this) - - if ( typeof options == 'string' ) { - return $this.data('alert')[options]() - } - - $(this).data('alert', new Alert( this )) - - }) - } - - $(document).ready(function () { - new Alert($('body')) + $(function () { + $('body').delegate('[data-alert-dismiss]', 'click', close) }) })( window.jQuery || window.ender )
\ No newline at end of file diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js index 6379653c56..6d9430b391 100644 --- a/js/bootstrap-dropdown.js +++ b/js/bootstrap-dropdown.js @@ -20,34 +20,22 @@ (function( $ ){ - var d = '[data-dropdown]' - - /* DROPDOWN PLUGIN DEFINITION - * ========================== */ - - $.fn.dropdown = function () { - return this.each(function () { - $(this).delegate(d, 'click', function (e) { - var li = $(this).parent('li') - , isActive = li.hasClass('open') - - clearMenus() - !isActive && li.toggleClass('open') - return false - }) - }) - } - /* APPLY TO STANDARD DROPDOWN ELEMENTS * =================================== */ function clearMenus() { - $(d).parent('li').removeClass('open') + $(selector).parent('li').removeClass('open') } $(function () { $('html').bind("click", clearMenus) - $('body').dropdown() + $('body').delegate('[data-dropdown]', 'click', function (e) { + var li = $(this).parent('li') + , isActive = li.hasClass('open') + clearMenus() + !isActive && li.toggleClass('open') + return false + }) }) })( window.jQuery || window.ender )
\ No newline at end of file diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index 60b83d58fd..02f8b23827 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -20,35 +20,6 @@ !function( $ ){ - /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) - * ======================================================= */ - - var transitionEnd - - $(document).ready(function () { - - $.support.transition = (function () { - var thisBody = document.body || document.documentElement - , thisStyle = thisBody.style - , support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined - return support - })() - - // set CSS transition event type - if ( $.support.transition ) { - transitionEnd = "TransitionEnd" - if ( $.browser.webkit ) { - transitionEnd = "webkitTransitionEnd" - } else if ( $.browser.mozilla ) { - transitionEnd = "transitionend" - } else if ( $.browser.opera ) { - transitionEnd = "oTransitionEnd" - } - } - - }) - - /* MODAL PUBLIC CLASS DEFINITION * ============================= */ @@ -76,25 +47,7 @@ this.$element.trigger('show') escape.call(this) - backdrop.call(this, function () { - var transition = $.support.transition && that.$element.hasClass('fade') - - that.$element - .appendTo(document.body) - .show() - - 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') - - }) + backdrop.call(this) return this } @@ -124,7 +77,7 @@ } $.support.transition && this.$element.hasClass('fade') ? - this.$element.one(transitionEnd, removeElement) : + this.$element.one($.support.transition.end, removeElement) : removeElement() return this @@ -136,9 +89,11 @@ /* MODAL PRIVATE METHODS * ===================== */ - function backdrop ( callback ) { + function backdrop () { var that = this , animate = this.$element.hasClass('fade') ? 'fade' : '' + , callback = $.proxy(show, this) + if ( this.isShown && this.settings.backdrop ) { var doAnimate = $.support.transition && animate @@ -156,7 +111,7 @@ this.$backdrop.addClass('in') doAnimate ? - this.$backdrop.one(transitionEnd, callback) : + this.$backdrop.one($.support.transition.end, callback) : callback() } else if ( !this.isShown && this.$backdrop ) { @@ -168,13 +123,33 @@ } $.support.transition && this.$element.hasClass('fade')? - this.$backdrop.one(transitionEnd, removeElement) : + this.$backdrop.one($.support.transition.end, removeElement) : removeElement() } else if ( callback ) { callback() } } + function show() { + var transition = $.support.transition && that.$element.hasClass('fade') + , that = this + + this.$element + .appendTo(document.body) + .show() + + if (transition) { + this.$element[0].offsetWidth // force reflow + } + + this.$element + .addClass('in') + + transition ? + this.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) : + this.$element.trigger('shown') + } + function escape() { var that = this if ( this.isShown && this.settings.keyboard ) { @@ -233,7 +208,7 @@ /* MODAL DATA-IMPLEMENTATION * ========================= */ - $(document).ready(function () { + $(function () { $('body').delegate('[data-controls-modal]', 'click', function (e) { e.preventDefault() var $this = $(this).data('show', true) diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index 1cf4b8917a..22db98fd9b 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -62,7 +62,6 @@ }) - /* POPOVER PLUGIN DEFINITION * ======================= */ diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js index 4b146e5809..23bdf59e9c 100644 --- a/js/bootstrap-scrollspy.js +++ b/js/bootstrap-scrollspy.js @@ -75,30 +75,7 @@ } - /* SCROLLSPY PLUGIN DEFINITION - * =========================== */ - - $.fn.scrollSpy = function( options ) { - var scrollspy = this.data('scrollspy') - - if (!scrollspy) { - return this.each(function () { - $(this).data('scrollspy', new ScrollSpy( this, options )) - }) - } - - if ( options === true ) { - return scrollspy - } - - if ( typeof options == 'string' ) { - scrollspy[options]() - } - - return this - } - - $(document).ready(function () { + $(function () { $('body').scrollSpy('[data-scrollspy] li > a') }) diff --git a/js/bootstrap-tabs.js b/js/bootstrap-tabs.js index b94adfc25d..6ee80429c7 100644 --- a/js/bootstrap-tabs.js +++ b/js/bootstrap-tabs.js @@ -55,14 +55,8 @@ /* TABS/PILLS PLUGIN DEFINITION * ============================ */ - $.fn.tabs = $.fn.pills = function ( selector ) { - return this.each(function () { - $(this).delegate(selector || '.tabs li > a, .pills > li > a', 'click', tab) - }) - } - - $(document).ready(function () { - $('body').tabs('ul[data-tabs] li > a, ul[data-pills] > li > a') + $(function () { + $('body').delegate('ul[data-tabs] > li > a, ul[data-pills] > li > a', 'click', tab) }) }( window.jQuery || window.ender );
\ No newline at end of file diff --git a/js/bootstrap-transitions.js b/js/bootstrap-transitions.js new file mode 100644 index 0000000000..49b5338a8f --- /dev/null +++ b/js/bootstrap-transitions.js @@ -0,0 +1,45 @@ +/* =================================================== + * bootstrap-transitions.js v2.0.0 + * http://twitter.github.com/bootstrap/javascript.html + * =================================================== + * Copyright 2011 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================== */ + +$(function () { + + /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) + * ======================================================= */ + + $.support.transition = (function () { + var thisBody = document.body || document.documentElement + , thisStyle = thisBody.style + , support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined + + return support && { + end: (function () { + var transitionEnd = "TransitionEnd" + if ( $.browser.webkit ) { + transitionEnd = "webkitTransitionEnd" + } else if ( $.browser.mozilla ) { + transitionEnd = "transitionend" + } else if ( $.browser.opera ) { + transitionEnd = "oTransitionEnd" + } + return transitionEnd + })() + } + })() + +})
\ No newline at end of file diff --git a/js/bootstrap-twipsy.js b/js/bootstrap-twipsy.js index 0144c48158..c44395e08e 100644 --- a/js/bootstrap-twipsy.js +++ b/js/bootstrap-twipsy.js @@ -21,35 +21,6 @@ !function( $ ) { - /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) - * ======================================================= */ - - var transitionEnd - - $(document).ready(function () { - - $.support.transition = (function () { - var thisBody = document.body || document.documentElement - , thisStyle = thisBody.style - , support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined - return support - })() - - // set CSS transition event type - if ( $.support.transition ) { - transitionEnd = "TransitionEnd" - if ( $.browser.webkit ) { - transitionEnd = "webkitTransitionEnd" - } else if ( $.browser.mozilla ) { - transitionEnd = "transitionend" - } else if ( $.browser.opera ) { - transitionEnd = "oTransitionEnd" - } - } - - }) - - /* TWIPSY PUBLIC CLASS DEFINITION * ============================== */ @@ -131,7 +102,7 @@ } $.support.transition && this.$tip.hasClass('fade') ? - $tip.bind(transitionEnd, removeElement) : + $tip.bind($.support.transition.end, removeElement) : removeElement() } |