From 157ec5feff877cd918a45985ee7368e3d9d7b5b0 Mon Sep 17 00:00:00 2001 From: Thomas Park Date: Thu, 5 Dec 2013 13:05:07 -0500 Subject: 3.0.2 -> 3.0.3 --- bower_components/bootstrap/js/affix.js | 2 +- bower_components/bootstrap/js/alert.js | 2 +- bower_components/bootstrap/js/button.js | 16 +- bower_components/bootstrap/js/carousel.js | 10 +- bower_components/bootstrap/js/collapse.js | 2 +- bower_components/bootstrap/js/dropdown.js | 10 +- bower_components/bootstrap/js/modal.js | 2 +- bower_components/bootstrap/js/popover.js | 2 +- bower_components/bootstrap/js/scrollspy.js | 4 +- bower_components/bootstrap/js/tab.js | 2 +- bower_components/bootstrap/js/tests/index.html | 52 - bower_components/bootstrap/js/tests/unit/affix.js | 25 - bower_components/bootstrap/js/tests/unit/alert.js | 62 - bower_components/bootstrap/js/tests/unit/button.js | 116 -- .../bootstrap/js/tests/unit/carousel.js | 87 -- .../bootstrap/js/tests/unit/collapse.js | 164 --- .../bootstrap/js/tests/unit/dropdown.js | 219 --- bower_components/bootstrap/js/tests/unit/modal.js | 196 --- .../bootstrap/js/tests/unit/phantom.js | 69 - .../bootstrap/js/tests/unit/popover.js | 133 -- .../bootstrap/js/tests/unit/scrollspy.js | 37 - bower_components/bootstrap/js/tests/unit/tab.js | 86 -- .../bootstrap/js/tests/unit/tooltip.js | 437 ------ .../bootstrap/js/tests/unit/transition.js | 13 - .../bootstrap/js/tests/vendor/jquery.js | 6 - .../bootstrap/js/tests/vendor/qunit.css | 232 --- .../bootstrap/js/tests/vendor/qunit.js | 1510 -------------------- bower_components/bootstrap/js/tooltip.js | 2 +- bower_components/bootstrap/js/transition.js | 2 +- 29 files changed, 31 insertions(+), 3469 deletions(-) delete mode 100644 bower_components/bootstrap/js/tests/index.html delete mode 100644 bower_components/bootstrap/js/tests/unit/affix.js delete mode 100644 bower_components/bootstrap/js/tests/unit/alert.js delete mode 100644 bower_components/bootstrap/js/tests/unit/button.js delete mode 100644 bower_components/bootstrap/js/tests/unit/carousel.js delete mode 100644 bower_components/bootstrap/js/tests/unit/collapse.js delete mode 100644 bower_components/bootstrap/js/tests/unit/dropdown.js delete mode 100644 bower_components/bootstrap/js/tests/unit/modal.js delete mode 100644 bower_components/bootstrap/js/tests/unit/phantom.js delete mode 100644 bower_components/bootstrap/js/tests/unit/popover.js delete mode 100644 bower_components/bootstrap/js/tests/unit/scrollspy.js delete mode 100644 bower_components/bootstrap/js/tests/unit/tab.js delete mode 100644 bower_components/bootstrap/js/tests/unit/tooltip.js delete mode 100644 bower_components/bootstrap/js/tests/unit/transition.js delete mode 100644 bower_components/bootstrap/js/tests/vendor/jquery.js delete mode 100644 bower_components/bootstrap/js/tests/vendor/qunit.css delete mode 100644 bower_components/bootstrap/js/tests/vendor/qunit.js (limited to 'bower_components/bootstrap/js') diff --git a/bower_components/bootstrap/js/affix.js b/bower_components/bootstrap/js/affix.js index 7d111ecc..552bffa3 100644 --- a/bower_components/bootstrap/js/affix.js +++ b/bower_components/bootstrap/js/affix.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: affix.js v3.0.2 + * Bootstrap: affix.js v3.0.3 * http://getbootstrap.com/javascript/#affix * ======================================================================== * Copyright 2013 Twitter, Inc. diff --git a/bower_components/bootstrap/js/alert.js b/bower_components/bootstrap/js/alert.js index 031d72aa..695ad74d 100644 --- a/bower_components/bootstrap/js/alert.js +++ b/bower_components/bootstrap/js/alert.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: alert.js v3.0.2 + * Bootstrap: alert.js v3.0.3 * http://getbootstrap.com/javascript/#alerts * ======================================================================== * Copyright 2013 Twitter, Inc. diff --git a/bower_components/bootstrap/js/button.js b/bower_components/bootstrap/js/button.js index 0145689d..c9fdde5e 100644 --- a/bower_components/bootstrap/js/button.js +++ b/bower_components/bootstrap/js/button.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: button.js v3.0.2 + * Bootstrap: button.js v3.0.3 * http://getbootstrap.com/javascript/#buttons * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -54,15 +54,21 @@ Button.prototype.toggle = function () { var $parent = this.$element.closest('[data-toggle="buttons"]') + var changed = true if ($parent.length) { var $input = this.$element.find('input') - .prop('checked', !this.$element.hasClass('active')) - .trigger('change') - if ($input.prop('type') === 'radio') $parent.find('.active').removeClass('active') + if ($input.prop('type') === 'radio') { + // see if clicking on current one + if ($input.prop('checked') && this.$element.hasClass('active')) + changed = false + else + $parent.find('.active').removeClass('active') + } + if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change') } - this.$element.toggleClass('active') + if (changed) this.$element.toggleClass('active') } diff --git a/bower_components/bootstrap/js/carousel.js b/bower_components/bootstrap/js/carousel.js index 902d4d78..6391a36d 100644 --- a/bower_components/bootstrap/js/carousel.js +++ b/bower_components/bootstrap/js/carousel.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: carousel.js v3.0.2 + * Bootstrap: carousel.js v3.0.3 * http://getbootstrap.com/javascript/#carousel * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -69,7 +69,7 @@ if (pos > (this.$items.length - 1) || pos < 0) return - if (this.sliding) return this.$element.one('slid', function () { that.to(pos) }) + if (this.sliding) return this.$element.one('slid.bs.carousel', function () { that.to(pos) }) if (activeIndex == pos) return this.pause().cycle() return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos])) @@ -121,7 +121,7 @@ if (this.$indicators.length) { this.$indicators.find('.active').removeClass('active') - this.$element.one('slid', function () { + this.$element.one('slid.bs.carousel', function () { var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()]) $nextIndicator && $nextIndicator.addClass('active') }) @@ -139,7 +139,7 @@ $next.removeClass([type, direction].join(' ')).addClass('active') $active.removeClass(['active', direction].join(' ')) that.sliding = false - setTimeout(function () { that.$element.trigger('slid') }, 0) + setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0) }) .emulateTransitionEnd(600) } else { @@ -148,7 +148,7 @@ $active.removeClass('active') $next.addClass('active') this.sliding = false - this.$element.trigger('slid') + this.$element.trigger('slid.bs.carousel') } isCycling && this.cycle() diff --git a/bower_components/bootstrap/js/collapse.js b/bower_components/bootstrap/js/collapse.js index 9967b167..1a079938 100644 --- a/bower_components/bootstrap/js/collapse.js +++ b/bower_components/bootstrap/js/collapse.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: collapse.js v3.0.2 + * Bootstrap: collapse.js v3.0.3 * http://getbootstrap.com/javascript/#collapse * ======================================================================== * Copyright 2013 Twitter, Inc. diff --git a/bower_components/bootstrap/js/dropdown.js b/bower_components/bootstrap/js/dropdown.js index d5da638d..13352ef7 100644 --- a/bower_components/bootstrap/js/dropdown.js +++ b/bower_components/bootstrap/js/dropdown.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: dropdown.js v3.0.2 + * Bootstrap: dropdown.js v3.0.3 * http://getbootstrap.com/javascript/#dropdowns * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -26,7 +26,7 @@ var backdrop = '.dropdown-backdrop' var toggle = '[data-toggle=dropdown]' var Dropdown = function (element) { - var $el = $(element).on('click.bs.dropdown', this.toggle) + $(element).on('click.bs.dropdown', this.toggle) } Dropdown.prototype.toggle = function (e) { @@ -41,7 +41,7 @@ if (!isActive) { if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) { - // if mobile we we use a backdrop because click events don't delegate + // if mobile we use a backdrop because click events don't delegate $('