From 69372701cfe58876623c89a0bdeca5ce91dd839b Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 24 Nov 2011 19:40:25 -0800 Subject: [PATCH] refactor dropdown in accordance with readme --- js/bootstrap-accordion.js | 41 ------------------------ js/bootstrap-alerts.js | 7 ++-- js/bootstrap-buttons.js | 67 +++++++++++++++++++++++---------------- js/bootstrap-dropdown.js | 47 +++++++++++++++------------ 4 files changed, 69 insertions(+), 93 deletions(-) delete mode 100644 js/bootstrap-accordion.js diff --git a/js/bootstrap-accordion.js b/js/bootstrap-accordion.js deleted file mode 100644 index 9a24b5ddfc..0000000000 --- a/js/bootstrap-accordion.js +++ /dev/null @@ -1,41 +0,0 @@ -/* ============================================================= - * bootstrap-accordion.js v2.0.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 565f831936..fabafa4f92 100644 --- a/js/bootstrap-alerts.js +++ b/js/bootstrap-alerts.js @@ -26,7 +26,7 @@ * ====================== */ var dismiss = '[data-dismiss="alert"]' - , Alert = function ( el, close ) { + , Alert = function ( el ) { $(el).delegate(dismiss, 'click', this.close) } @@ -36,7 +36,6 @@ var $element = $(this) $element = $element.hasClass('alert-message') ? $element : $element.parent() - e && e.preventDefault() $element.removeClass('in') @@ -55,12 +54,12 @@ /* ALERT PLUGIN DEFINITION * ======================= */ - $.fn.alert = function ( options ) { + $.fn.alert = function ( option ) { return this.each(function () { var $this = $(this) , data = $this.data('alert') if (!data) $this.data('alert', (data = new Alert(this))) - if (typeof options == 'string') data[options].call($this) + if (typeof option == 'string') data[option].call($this) }) } diff --git a/js/bootstrap-buttons.js b/js/bootstrap-buttons.js index 5ca678df8b..82d80df2d9 100644 --- a/js/bootstrap-buttons.js +++ b/js/bootstrap-buttons.js @@ -24,45 +24,56 @@ /* BUTTON PUBLIC CLASS DEFINITION * ============================== */ - var Button - - function setState(el, state) { - var d = 'disabled' - , $el = $(el) - , data = $el.data() - , val = $el.is('input') ? 'val' : 'html' - - state = state + 'Text' - data.resetText || $el.data('resetText', $el[val]()) - - $el[val]( data[state] || $.fn.button.defaults[state] ) - - setTimeout(function () { - state == 'loadingText' ? - $el.addClass(d).attr(d, d) : - $el.removeClass(d).removeAttr(d) - }, 0) + var Button = function (element, options) { + this.$element = $(element) + this.settings = $.extend({}, $.fn.button.defaults, options) } - function toggle(el) { - var $el = $(el) - , $parent = $el.parent('[data-toggle="buttons-radio"]') + Button.prototype = { - $parent && $parent - .find('.active') - .removeClass('active') + setState: function (state) { + var d = 'disabled' + , $el = this.$element + , data = $el.data() + , val = $el.is('input') ? 'val' : 'html' + + state = state + 'Text' + data.resetText || $el.data('resetText', $el[val]()) + + $el[val](data[state] || this.settings[state]) + + // push to event loop to allow forms to submit + setTimeout(function () { + state == 'loadingText' ? + $el.addClass(d).attr(d, d) : + $el.removeClass(d).removeAttr(d) + }, 0) + } + + , toggle: function () { + var $parent = this.$element.parent('[data-toggle="buttons-radio"]') + + $parent && $parent + .find('.active') + .removeClass('active') + + this.$element.toggleClass('active') + } - $el.toggleClass('active') } /* BUTTON PLUGIN DEFINITION * ======================== */ - $.fn.button = function(options) { + $.fn.button = function ( option ) { return this.each(function () { - if (options == 'toggle') return toggle(this) - options && setState(this, options) + var $this = $(this) + , data = $this.data('button') + , options = typeof option == 'object' && option + if (!data) $this.data('button', (data = new Button(this, options))) + if (option == 'toggle') data.toggle() + else if (option) data.setState(option) }) } diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js index ef243fc6f6..4526a9203b 100644 --- a/js/bootstrap-dropdown.js +++ b/js/bootstrap-dropdown.js @@ -22,35 +22,42 @@ "use strict" - /* SIMPLE DROPDOWN LOGIC - * ===================== */ + /* DROPDOWN CLASS DEFINITION + * ========================= */ - var s = '[data-toggle="dropdown"]' + var toggle = '[data-toggle="dropdown"]' + , Dropdown = function ( element ) { + $(element).bind('click', this.toggle) + } + + Dropdown.prototype = { + + toggle: function ( e ) { + var li = $(this).parent('li') + , isActive = li.hasClass('open') + + clearMenus() + !isActive && li.toggleClass('open') + + return false + } - function clearMenus() { - $(s).parent('li').removeClass('open') } - function toggle(e) { - var li = $(this).parent('li') - , isActive = li.hasClass('open') - - clearMenus() - !isActive && li.toggleClass('open') - - return false + function clearMenus() { + $(toggle).parent('li').removeClass('open') } /* DROPDOWN PLUGIN DEFINITION * ========================== */ - $.fn.dropdown = function ( selector ) { + $.fn.dropdown = function ( option ) { return this.each(function () { - var args = ['click', toggle] - , $this = $(this) - selector && args.unshift(selector) - $this[selector ? 'delegate' : 'bind'].apply($this, args) + var $this = $(this) + , data = $this.data('dropdown') + if (!data) $this.data('dropdown', (data = new Dropdown(this))) + if (typeof option == 'string') data[option].call($this) }) } @@ -59,8 +66,8 @@ * =================================== */ $(function () { - $('html').bind("click.dropdown.data-api", clearMenus) - $('body').dropdown(s) + $('html').bind('click.dropdown.data-api', clearMenus) + $('body').delegate(toggle, 'click.dropdown.data-api', Dropdown.prototype.toggle) }) }( window.jQuery || window.ender ); \ No newline at end of file