From 6e77c9d1233c1621deeaa2dd00e6eca3fd618610 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 13 Feb 2012 18:41:02 -0800 Subject: add semicolons to the end of js files --- js/bootstrap-alert.js | 2 +- js/bootstrap-button.js | 2 +- js/bootstrap-carousel.js | 2 +- js/bootstrap-collapse.js | 2 +- js/bootstrap-dropdown.js | 2 +- js/bootstrap-modal.js | 2 +- js/bootstrap-popover.js | 2 +- js/bootstrap-scrollspy.js | 2 +- js/bootstrap-tab.js | 2 +- js/bootstrap-tooltip.js | 2 +- js/bootstrap-transition.js | 4 ++-- js/bootstrap-typeahead.js | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) (limited to 'js') diff --git a/js/bootstrap-alert.js b/js/bootstrap-alert.js index 4a65b135a..56d89c298 100644 --- a/js/bootstrap-alert.js +++ b/js/bootstrap-alert.js @@ -88,4 +88,4 @@ $('body').on('click.alert.data-api', dismiss, Alert.prototype.close) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/js/bootstrap-button.js b/js/bootstrap-button.js index a3f4657e8..89101ed7b 100644 --- a/js/bootstrap-button.js +++ b/js/bootstrap-button.js @@ -95,4 +95,4 @@ }) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index 2f47edb8d..3c0f1df83 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -151,4 +151,4 @@ }) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 8134cc42f..53bcd7c40 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -133,4 +133,4 @@ }) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js index 48d3ce0f8..ce65aa3b5 100644 --- a/js/bootstrap-dropdown.js +++ b/js/bootstrap-dropdown.js @@ -89,4 +89,4 @@ $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index ffbed0d2e..0a69b6a2f 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -207,4 +207,4 @@ }) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index 35ff9d0ab..4df81fee9 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -92,4 +92,4 @@ , template: '

' }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js index e8bd0715c..f9aba137b 100644 --- a/js/bootstrap-scrollspy.js +++ b/js/bootstrap-scrollspy.js @@ -122,4 +122,4 @@ }) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/js/bootstrap-tab.js b/js/bootstrap-tab.js index f19db5da1..78258c6a0 100644 --- a/js/bootstrap-tab.js +++ b/js/bootstrap-tab.js @@ -127,4 +127,4 @@ }) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js index 21f2311fb..e1c8b2dc2 100644 --- a/js/bootstrap-tooltip.js +++ b/js/bootstrap-tooltip.js @@ -267,4 +267,4 @@ , template: '
' } -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js index 956350bd0..0b13eccd4 100644 --- a/js/bootstrap-transition.js +++ b/js/bootstrap-transition.js @@ -47,5 +47,5 @@ })() }) - -}( window.jQuery ) + +}( window.jQuery ); \ No newline at end of file diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js index 1426185af..e0be49fec 100644 --- a/js/bootstrap-typeahead.js +++ b/js/bootstrap-typeahead.js @@ -268,4 +268,4 @@ }) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file -- cgit v1.2.3 From 792059b7adf65843a7befdd0d6a5b3b57aeb6d61 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 16 Feb 2012 20:04:26 -0800 Subject: fix alerts --- js/bootstrap-alert.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'js') diff --git a/js/bootstrap-alert.js b/js/bootstrap-alert.js index 56d89c298..1d69c5f53 100644 --- a/js/bootstrap-alert.js +++ b/js/bootstrap-alert.js @@ -51,11 +51,14 @@ $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) - $parent.removeClass('in') + $parent + .trigger('close') + .removeClass('in') function removeElement() { - $parent.remove() - $parent.trigger('closed') + $parent + .trigger('closed') + .remove() } $.support.transition && $parent.hasClass('fade') ? -- cgit v1.2.3 From e730f8adb562ccb885d48fea6f8f075530ef53d8 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 16 Feb 2012 20:22:01 -0800 Subject: null out interval so that pause doesn't resume on next or prev --- js/bootstrap-carousel.js | 1 + 1 file changed, 1 insertion(+) (limited to 'js') diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index 3c0f1df83..374697994 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -61,6 +61,7 @@ , pause: function () { clearInterval(this.interval) + this.interval = null return this } -- cgit v1.2.3 From 9d12b2d60168505fdb68672f6fe7992bb264da90 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 16 Feb 2012 20:43:57 -0800 Subject: don't try next if not next --- js/bootstrap-carousel.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'js') diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index 374697994..bad4f46f4 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -83,6 +83,8 @@ , fallback = type == 'next' ? 'first' : 'last' , that = this + if (!$next.length) return + this.sliding = true isCycling && this.pause() -- cgit v1.2.3