From 527fb87dadd1e677f132ca3db0b02825d5bd57e5 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 17 Mar 2012 21:29:56 -0700 Subject: add /head --- js/tests/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js') diff --git a/js/tests/index.html b/js/tests/index.html index 8c710de36..2d59ab032 100644 --- a/js/tests/index.html +++ b/js/tests/index.html @@ -36,7 +36,7 @@ - +

Bootstrap Plugin Test Suite

-- cgit v1.2.3 From 5a2c7eb50abae8d07cebb6b0e984f7e63843cf75 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 19 Mar 2012 15:18:00 -0700 Subject: select last item in scrollspy if you've reached the bottom of the document or element --- js/bootstrap-scrollspy.js | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'js') diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js index ea29f2f86..47b485785 100644 --- a/js/bootstrap-scrollspy.js +++ b/js/bootstrap-scrollspy.js @@ -57,11 +57,18 @@ , process: function () { var scrollTop = this.$scrollElement.scrollTop() + this.options.offset + , scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight + , maxScroll = scrollHeight - this.$scrollElement.height() , offsets = this.offsets , targets = this.targets , activeTarget = this.activeTarget , i + if (scrollTop >= maxScroll) { + return activeTarget != (i = targets.last()[0]) + && this.activate ( i ); + } + for (i = offsets.length; i--;) { activeTarget != targets[i] && scrollTop >= offsets[i] -- cgit v1.2.3 From bf59220b87a3b5960381f500dbc6a310a8aef60b Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 19 Mar 2012 15:19:01 -0700 Subject: ;) --- js/bootstrap-scrollspy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js') diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js index 47b485785..b7ff907f7 100644 --- a/js/bootstrap-scrollspy.js +++ b/js/bootstrap-scrollspy.js @@ -66,7 +66,7 @@ if (scrollTop >= maxScroll) { return activeTarget != (i = targets.last()[0]) - && this.activate ( i ); + && this.activate ( i ) } for (i = offsets.length; i--;) { -- cgit v1.2.3 From 83a7a698939b5b4cba3c04a86befc12b9005df3d Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 19 Mar 2012 15:33:28 -0700 Subject: typeahead should escape regexp special chars --- js/bootstrap-typeahead.js | 3 ++- js/tests/unit/bootstrap-typeahead.js | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) (limited to 'js') diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js index dc2f88221..804e60dc4 100644 --- a/js/bootstrap-typeahead.js +++ b/js/bootstrap-typeahead.js @@ -109,7 +109,8 @@ } , highlighter: function (item) { - return item.replace(new RegExp('(' + this.query + ')', 'ig'), function ($1, match) { + var query = this.query.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&') + return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) { return '' + match + '' }) } diff --git a/js/tests/unit/bootstrap-typeahead.js b/js/tests/unit/bootstrap-typeahead.js index 96ea7c45f..25d313c85 100644 --- a/js/tests/unit/bootstrap-typeahead.js +++ b/js/tests/unit/bootstrap-typeahead.js @@ -52,6 +52,22 @@ $(function () { typeahead.$menu.remove() }) + test("should not explode when regex chars are entered", function () { + var $input = $('').typeahead({ + source: ['aa', 'ab', 'ac', 'mdo*', 'fat+'] + }) + , typeahead = $input.data('typeahead') + + $input.val('+') + typeahead.lookup() + + ok(typeahead.$menu.is(":visible"), 'typeahead is visible') + equals(typeahead.$menu.find('li').length, 1, 'has 1 item in menu') + equals(typeahead.$menu.find('.active').length, 1, 'one item is active') + + typeahead.$menu.remove() + }) + test("should hide menu when query entered", function () { stop() var $input = $('').typeahead({ -- cgit v1.2.3 From 67f199678c6f764f2812260f42b553b22ec740f8 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 19 Mar 2012 15:48:57 -0700 Subject: if interval is false, do not autocycle the carousel --- js/bootstrap-carousel.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'js') diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index 8c0723d28..287519900 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -27,7 +27,7 @@ var Carousel = function (element, options) { this.$element = $(element) - this.options = $.extend({}, $.fn.carousel.defaults, options) + this.options = options this.options.slide && this.slide(this.options.slide) this.options.pause == 'hover' && this.$element .on('mouseenter', $.proxy(this.pause, this)) @@ -37,7 +37,8 @@ Carousel.prototype = { cycle: function () { - this.interval = setInterval($.proxy(this.next, this), this.options.interval) + this.options.interval + && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) return this } @@ -129,11 +130,11 @@ return this.each(function () { var $this = $(this) , data = $this.data('carousel') - , options = typeof option == 'object' && option + , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option) if (!data) $this.data('carousel', (data = new Carousel(this, options))) if (typeof option == 'number') data.to(option) else if (typeof option == 'string' || (option = options.slide)) data[option]() - else data.cycle() + else if (options.interval) data.cycle() }) } -- cgit v1.2.3 From 05e0d5f3d931e84f3bc86a5c1153e710237cb53a Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 19 Mar 2012 16:09:08 -0700 Subject: fire active event on active --- js/bootstrap-scrollspy.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'js') diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js index b7ff907f7..dea6e95f0 100644 --- a/js/bootstrap-scrollspy.js +++ b/js/bootstrap-scrollspy.js @@ -92,8 +92,10 @@ .addClass('active') if ( active.parent('.dropdown-menu') ) { - active.closest('li.dropdown').addClass('active') + active = active.closest('li.dropdown').addClass('active') } + + active.trigger('active') } } -- cgit v1.2.3 From 384a082e8d220115d0eb94b0c57d837b625ad2ab Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 19 Mar 2012 20:24:46 -0700 Subject: active - onActivate --- js/bootstrap-scrollspy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js') diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js index dea6e95f0..e0c74539e 100644 --- a/js/bootstrap-scrollspy.js +++ b/js/bootstrap-scrollspy.js @@ -95,7 +95,7 @@ active = active.closest('li.dropdown').addClass('active') } - active.trigger('active') + active.trigger('activate') } } -- cgit v1.2.3 From 630ff4ff7dca4d51474b8b4168e48e60fc858e0c Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 19 Mar 2012 20:51:20 -0700 Subject: fix collapse bug in ie7+ for initial collapse in --- js/bootstrap-collapse.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js') diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 9a364468b..228d2a182 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -74,7 +74,7 @@ [dimension](size || 'auto') [0].offsetWidth - this.$element[size ? 'addClass' : 'removeClass']('collapse') + this.$element[size != null ? 'addClass' : 'removeClass']('collapse') return this } -- cgit v1.2.3 From bce33bbb091e66a58418395188ea50be151f3f8e Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 19 Mar 2012 21:10:55 -0700 Subject: if parent in collapse, only grab children --- js/bootstrap-collapse.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'js') diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 228d2a182..2dbf7a761 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -44,7 +44,7 @@ , show: function () { var dimension = this.dimension() , scroll = $.camelCase(['scroll', dimension].join('-')) - , actives = this.$parent && this.$parent.find('.in') + , actives = this.$parent && this.$parent.find('> .accordion-group > .in') , hasData if (actives && actives.length) { @@ -56,7 +56,6 @@ this.$element[dimension](0) this.transition('addClass', 'show', 'shown') this.$element[dimension](this.$element[0][scroll]) - } , hide: function () { -- cgit v1.2.3 From 63bd7cb478500463ac7339667d89792f7108f3c0 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 19 Mar 2012 21:39:39 -0700 Subject: fix slide logic for ie+ in carousel --- js/bootstrap-carousel.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'js') diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index 287519900..7db5bea33 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -95,13 +95,7 @@ if ($next.hasClass('active')) return - if (!$.support.transition && this.$element.hasClass('slide')) { - this.$element.trigger('slide') - $active.removeClass('active') - $next.addClass('active') - this.sliding = false - this.$element.trigger('slid') - } else { + if ($.support.transition && this.$element.hasClass('slide')) { $next.addClass(type) $next[0].offsetWidth // force reflow $active.addClass(direction) @@ -113,6 +107,12 @@ that.sliding = false setTimeout(function () { that.$element.trigger('slid') }, 0) }) + } else { + this.$element.trigger('slide') + $active.removeClass('active') + $next.addClass('active') + this.sliding = false + this.$element.trigger('slid') } isCycling && this.cycle() -- cgit v1.2.3 From 663e41d74f6369812da29a1dd66b0b1fcfd22827 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 19 Mar 2012 23:13:55 -0700 Subject: prevent dropdowns from closing when clicking inside form element inside dropdown --- js/bootstrap-dropdown.js | 4 +++- js/bootstrap-typeahead.js | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'js') diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js index 54b61c5e9..f26b83f41 100644 --- a/js/bootstrap-dropdown.js +++ b/js/bootstrap-dropdown.js @@ -86,7 +86,9 @@ $(function () { $('html').on('click.dropdown.data-api', clearMenus) - $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle) + $('body') + .on('click.dropdown', '.dropdown form', function (e) { e.stopPropagation() }) + .on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle) }) }( window.jQuery ); \ No newline at end of file diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js index 804e60dc4..f4d26186c 100644 --- a/js/bootstrap-typeahead.js +++ b/js/bootstrap-typeahead.js @@ -39,8 +39,9 @@ , select: function () { var val = this.$menu.find('.active').attr('data-value') - this.$element.val(val) - this.$element.change(); + this.$element + .val(val) + .change() return this.hide() } -- cgit v1.2.3 From cb8dcfcebfbbd8f2ea26b786b44992f00d35ac30 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 20 Mar 2012 22:43:27 -0700 Subject: if transitioning collapse, don't start new transition --- js/bootstrap-collapse.js | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'js') diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 2dbf7a761..16b91eb24 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -42,11 +42,18 @@ } , show: function () { - var dimension = this.dimension() - , scroll = $.camelCase(['scroll', dimension].join('-')) - , actives = this.$parent && this.$parent.find('> .accordion-group > .in') + var dimension + , scroll + , actives , hasData + if (this.transitioning) return + + dimension = this.dimension() + scroll = $.camelCase(['scroll', dimension].join('-')) + actives = this.$parent && this.$parent.find('> .accordion-group > .in') + hasData + if (actives && actives.length) { hasData = actives.data('collapse') actives.collapse('hide') @@ -59,7 +66,9 @@ } , hide: function () { - var dimension = this.dimension() + var dimension + if (this.transitioning) return + dimension = this.dimension() this.reset(this.$element[dimension]()) this.transition('removeClass', 'hide', 'hidden') this.$element[dimension](0) @@ -82,9 +91,12 @@ var that = this , complete = function () { if (startEvent == 'show') that.reset() + that.transitioning = 0 that.$element.trigger(completeEvent) } + this.transitioning = 1 + this.$element .trigger(startEvent) [method]('in') -- cgit v1.2.3 From d5fb653914617d63739142f6ecef00afd4d3c796 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 21 Mar 2012 21:35:02 -0700 Subject: top stripping leading and trailing whitespace + always use .html method --- js/bootstrap-popover.js | 6 ++---- js/bootstrap-tooltip.js | 2 -- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'js') diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index e1aa5ac39..6f389785c 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -38,8 +38,8 @@ , title = this.getTitle() , content = this.getContent() - $tip.find('.popover-title')[ $.type(title) == 'object' ? 'append' : 'html' ](title) - $tip.find('.popover-content > *')[ $.type(content) == 'object' ? 'append' : 'html' ](content) + $tip.find('.popover-title').html(title) + $tip.find('.popover-content > *').html(content) $tip.removeClass('fade top bottom left right in') } @@ -56,8 +56,6 @@ content = $e.attr('data-content') || (typeof o.content == 'function' ? o.content.call($e[0]) : o.content) - content = content.toString().replace(/(^\s*|\s*$)/, "") - return content } diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js index 49b5f7286..2b5f146b1 100644 --- a/js/bootstrap-tooltip.js +++ b/js/bootstrap-tooltip.js @@ -206,8 +206,6 @@ title = $e.attr('data-original-title') || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) - title = (title || '').toString().replace(/(^\s*|\s*$)/, "") - return title } -- cgit v1.2.3 From 94b24aaa473755093677cb4eb80faf3daee53357 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 21 Mar 2012 21:57:06 -0700 Subject: clear timeout to reset delays for tooltip/popover --- js/bootstrap-tooltip.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'js') diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js index 2b5f146b1..7d58a6c8d 100644 --- a/js/bootstrap-tooltip.js +++ b/js/bootstrap-tooltip.js @@ -73,8 +73,9 @@ if (!self.options.delay || !self.options.delay.show) { self.show() } else { + clearTimeout(this.timeout) self.hoverState = 'in' - setTimeout(function() { + this.timeout = setTimeout(function() { if (self.hoverState == 'in') { self.show() } @@ -88,8 +89,9 @@ if (!self.options.delay || !self.options.delay.hide) { self.hide() } else { + clearTimeout(this.timeout) self.hoverState = 'out' - setTimeout(function() { + this.timeout = setTimeout(function() { if (self.hoverState == 'out') { self.hide() } -- cgit v1.2.3 From 706ee46b73b58059230b24589160da784778aad2 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 21 Mar 2012 23:45:58 -0700 Subject: sort scrollspy to prevent flicker for unordered nav --- js/bootstrap-scrollspy.js | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'js') diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js index e0c74539e..5008b0fe9 100644 --- a/js/bootstrap-scrollspy.js +++ b/js/bootstrap-scrollspy.js @@ -43,16 +43,25 @@ constructor: ScrollSpy , refresh: function () { - this.targets = this.$body + var self = this + , $targets + + this.offsets = [] + this.targets = [] + + $targets = this.$body .find(this.selector) .map(function () { var href = $(this).attr('href') - return /^#\w/.test(href) && $(href).length ? href : null + return /^#\w/.test(href) + && $(href).length + && [[ $(href).position().top, href ]] + }) + .sort(function (a, b) { return a[0] - b[0] }) + .each(function () { + self.offsets.push(this[0]) + self.targets.push(this[1]) }) - - this.offsets = $.map(this.targets, function (id) { - return $(id).position().top - }) } , process: function () { -- cgit v1.2.3 From 20e085723b3f55fdc1db7f1687d535af7d127319 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 21 Mar 2012 23:51:32 -0700 Subject: cache $(href) lookup --- js/bootstrap-scrollspy.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'js') diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js index 5008b0fe9..487e6818b 100644 --- a/js/bootstrap-scrollspy.js +++ b/js/bootstrap-scrollspy.js @@ -53,9 +53,10 @@ .find(this.selector) .map(function () { var href = $(this).attr('href') - return /^#\w/.test(href) - && $(href).length - && [[ $(href).position().top, href ]] + , $href = /^#\w/.test(href) && $(href) + return $href + && href.length + && [[ $href.position().top, href ]] }) .sort(function (a, b) { return a[0] - b[0] }) .each(function () { -- cgit v1.2.3 From b3bf223617754e658eb62ef0f068732e719a2c82 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 21 Mar 2012 23:59:27 -0700 Subject: filter out non matches in map --- js/bootstrap-scrollspy.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js') diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js index 487e6818b..bd3f10604 100644 --- a/js/bootstrap-scrollspy.js +++ b/js/bootstrap-scrollspy.js @@ -54,9 +54,9 @@ .map(function () { var href = $(this).attr('href') , $href = /^#\w/.test(href) && $(href) - return $href + return ( $href && href.length - && [[ $href.position().top, href ]] + && [[ $href.position().top, href ]] ) || null }) .sort(function (a, b) { return a[0] - b[0] }) .each(function () { -- cgit v1.2.3 From ef5ac02b698ffab3a42d21f20859b70df85543c0 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 24 Mar 2012 17:50:21 -0700 Subject: allow prevent default for show and hide event in modal --- js/bootstrap-modal.js | 19 ++++++++++++------- js/tests/unit/bootstrap-modal.js | 29 +++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 7 deletions(-) (limited to 'js') diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index e92970627..3e0fb1481 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -41,13 +41,15 @@ , show: function () { var that = this + , e = $.Event('show') - if (this.isShown) return + this.$element.trigger(e) + + if (this.isShown || e.isDefaultPrevented()) return $('body').addClass('modal-open') this.isShown = true - this.$element.trigger('show') escape.call(this) backdrop.call(this, function () { @@ -74,18 +76,21 @@ , hide: function ( e ) { e && e.preventDefault() - if (!this.isShown) return - var that = this + + e = $.Event('hide') + + this.$element.trigger(e) + + if (!this.isShown || e.isDefaultPrevented()) return + this.isShown = false $('body').removeClass('modal-open') escape.call(this) - this.$element - .trigger('hide') - .removeClass('in') + this.$element.removeClass('in') $.support.transition && this.$element.hasClass('fade') ? hideWithTransition.call(this) : diff --git a/js/tests/unit/bootstrap-modal.js b/js/tests/unit/bootstrap-modal.js index 22f5781ea..0851f64a7 100644 --- a/js/tests/unit/bootstrap-modal.js +++ b/js/tests/unit/bootstrap-modal.js @@ -29,6 +29,35 @@ $(function () { .modal("show") }) + test("should fire show event", function () { + stop() + $.support.transition = false + $("") + .bind("show", function () { + ok(true, "show was called") + }) + .bind("shown", function () { + $(this).remove() + start() + }) + .modal("show") + }) + + test("should not fire shown when default prevented", function () { + stop() + $.support.transition = false + $("") + .bind("show", function (e) { + e.preventDefault() + ok(true, "show was called") + start() + }) + .bind("shown", function () { + ok(false, "shown was called") + }) + .modal("show") + }) + test("should hide modal when hide is called", function () { stop() $.support.transition = false -- cgit v1.2.3 From bccc2cb7191eb54a4d67563625a748d7ecd381d4 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 24 Mar 2012 18:20:09 -0700 Subject: add preventDefault support for all inital event types (show, close, hide, etc.) + fix small bug with scrollspy.last --- js/bootstrap-alert.js | 9 +++++---- js/bootstrap-carousel.js | 7 +++++-- js/bootstrap-collapse.js | 12 +++++++----- js/bootstrap-scrollspy.js | 4 ++-- js/bootstrap-tab.js | 10 +++++++--- js/tests/index.html | 2 ++ js/tests/unit/bootstrap-alert.js | 15 +++++++++++++++ js/tests/unit/bootstrap-carousel.js | 28 ++++++++++++++++++++++++++++ js/tests/unit/bootstrap-collapse.js | 15 +++++++++++++++ js/tests/unit/bootstrap-tab.js | 16 ++++++++++++++++ 10 files changed, 102 insertions(+), 16 deletions(-) create mode 100644 js/tests/unit/bootstrap-carousel.js (limited to 'js') diff --git a/js/bootstrap-alert.js b/js/bootstrap-alert.js index d17f44e15..7a1607da1 100644 --- a/js/bootstrap-alert.js +++ b/js/bootstrap-alert.js @@ -45,15 +45,16 @@ } $parent = $(selector) - $parent.trigger('close') e && e.preventDefault() $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) - $parent - .trigger('close') - .removeClass('in') + $parent.trigger(e = $.Event('close')) + + if (e.isDefaultPrevented()) return + + $parent.removeClass('in') function removeElement() { $parent diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index 7db5bea33..8ce7418d2 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -86,6 +86,7 @@ , direction = type == 'next' ? 'left' : 'right' , fallback = type == 'next' ? 'first' : 'last' , that = this + , e = $.Event('slide') this.sliding = true @@ -96,11 +97,12 @@ if ($next.hasClass('active')) return if ($.support.transition && this.$element.hasClass('slide')) { + this.$element.trigger(e) + if (e.isDefaultPrevented()) return $next.addClass(type) $next[0].offsetWidth // force reflow $active.addClass(direction) $next.addClass(direction) - this.$element.trigger('slide') this.$element.one($.support.transition.end, function () { $next.removeClass([type, direction].join(' ')).addClass('active') $active.removeClass(['active', direction].join(' ')) @@ -108,7 +110,8 @@ setTimeout(function () { that.$element.trigger('slid') }, 0) }) } else { - this.$element.trigger('slide') + this.$element.trigger(e) + if (e.isDefaultPrevented()) return $active.removeClass('active') $next.addClass('active') this.sliding = false diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 16b91eb24..478eea391 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -61,7 +61,7 @@ } this.$element[dimension](0) - this.transition('addClass', 'show', 'shown') + this.transition('addClass', $.Event('show'), 'shown') this.$element[dimension](this.$element[0][scroll]) } @@ -70,7 +70,7 @@ if (this.transitioning) return dimension = this.dimension() this.reset(this.$element[dimension]()) - this.transition('removeClass', 'hide', 'hidden') + this.transition('removeClass', $.Event('hide'), 'hidden') this.$element[dimension](0) } @@ -95,11 +95,13 @@ that.$element.trigger(completeEvent) } + this.$element.trigger(startEvent) + + if (startEvent.isDefaultPrevented()) return + this.transitioning = 1 - this.$element - .trigger(startEvent) - [method]('in') + this.$element[method]('in') $.support.transition && this.$element.hasClass('collapse') ? this.$element.one($.support.transition.end, complete) : diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js index bd3f10604..c02e263b0 100644 --- a/js/bootstrap-scrollspy.js +++ b/js/bootstrap-scrollspy.js @@ -46,8 +46,8 @@ var self = this , $targets - this.offsets = [] - this.targets = [] + this.offsets = $([]) + this.targets = $([]) $targets = this.$body .find(this.selector) diff --git a/js/bootstrap-tab.js b/js/bootstrap-tab.js index b3938f671..974cc0aca 100644 --- a/js/bootstrap-tab.js +++ b/js/bootstrap-tab.js @@ -39,6 +39,7 @@ , selector = $this.attr('data-target') , previous , $target + , e if (!selector) { selector = $this.attr('href') @@ -49,11 +50,14 @@ previous = $ul.find('.active a').last()[0] - $this.trigger({ - type: 'show' - , relatedTarget: previous + e = $.Event('show', { + relatedTarget: previous }) + $this.trigger(e) + + if (e.isDefaultPrevented()) return + $target = $(selector) this.activate($this.parent('li'), $ul) diff --git a/js/tests/index.html b/js/tests/index.html index 2d59ab032..3e6cb9777 100644 --- a/js/tests/index.html +++ b/js/tests/index.html @@ -15,6 +15,7 @@ + @@ -28,6 +29,7 @@ + diff --git a/js/tests/unit/bootstrap-alert.js b/js/tests/unit/bootstrap-alert.js index e607f4340..7f24e0e6b 100644 --- a/js/tests/unit/bootstrap-alert.js +++ b/js/tests/unit/bootstrap-alert.js @@ -38,4 +38,19 @@ $(function () { ok(!$('#qunit-fixture').find('.alert-message').length, 'element removed from dom') }) + test("should not fire closed when close is prevented", function () { + $.support.transition = false + stop(); + $('
') + .bind('close', function (e) { + e.preventDefault(); + ok(true); + start(); + }) + .bind('closed', function () { + ok(false); + }) + .alert('close') + }) + }) \ No newline at end of file diff --git a/js/tests/unit/bootstrap-carousel.js b/js/tests/unit/bootstrap-carousel.js new file mode 100644 index 000000000..92c23e227 --- /dev/null +++ b/js/tests/unit/bootstrap-carousel.js @@ -0,0 +1,28 @@ +$(function () { + + module("bootstrap-carousel") + + test("should be defined on jquery object", function () { + ok($(document.body).carousel, 'carousel method is defined') + }) + + test("should return element", function () { + ok($(document.body).carousel()[0] == document.body, 'document.body returned') + }) + + test("should not fire sliden when slide is prevented", function () { + $.support.transition = false + stop(); + $('
') + .bind('slide', function (e) { + e.preventDefault(); + ok(true); + start(); + }) + .bind('slid', function () { + ok(false); + }) + .carousel('next') + }) + +}) \ No newline at end of file diff --git a/js/tests/unit/bootstrap-collapse.js b/js/tests/unit/bootstrap-collapse.js index 698238d96..8e52898b5 100644 --- a/js/tests/unit/bootstrap-collapse.js +++ b/js/tests/unit/bootstrap-collapse.js @@ -22,4 +22,19 @@ $(function () { ok(/height/.test(el.attr('style')), 'has height set') }) + test("should not fire shown when show is prevented", function () { + $.support.transition = false + stop(); + $('
') + .bind('show', function (e) { + e.preventDefault(); + ok(true); + start(); + }) + .bind('shown', function () { + ok(false); + }) + .collapse('show') + }) + }) \ No newline at end of file diff --git a/js/tests/unit/bootstrap-tab.js b/js/tests/unit/bootstrap-tab.js index 18f490fa5..987804781 100644 --- a/js/tests/unit/bootstrap-tab.js +++ b/js/tests/unit/bootstrap-tab.js @@ -42,4 +42,20 @@ $(function () { equals($("#qunit-fixture").find('.active').attr('id'), "home") }) + + test("should not fire closed when close is prevented", function () { + $.support.transition = false + stop(); + $('
') + .bind('show', function (e) { + e.preventDefault(); + ok(true); + start(); + }) + .bind('shown', function () { + ok(false); + }) + .tab('show') + }) + }) \ No newline at end of file -- cgit v1.2.3 From f02d017ffa2f63609db034410979f62fde328816 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 24 Mar 2012 18:59:04 -0700 Subject: return matcher value directly + cleanup first lines of files --- js/bootstrap-alert.js | 2 +- js/bootstrap-button.js | 3 ++- js/bootstrap-carousel.js | 2 +- js/bootstrap-collapse.js | 3 ++- js/bootstrap-dropdown.js | 2 +- js/bootstrap-modal.js | 2 +- js/bootstrap-popover.js | 2 +- js/bootstrap-scrollspy.js | 1 + js/bootstrap-tab.js | 2 +- js/bootstrap-tooltip.js | 3 ++- js/bootstrap-transition.js | 3 ++- js/bootstrap-typeahead.js | 3 ++- 12 files changed, 17 insertions(+), 11 deletions(-) (limited to 'js') diff --git a/js/bootstrap-alert.js b/js/bootstrap-alert.js index 7a1607da1..c7171855d 100644 --- a/js/bootstrap-alert.js +++ b/js/bootstrap-alert.js @@ -18,7 +18,7 @@ * ========================================================== */ -!function( $ ){ +!function ( $ ) { "use strict" diff --git a/js/bootstrap-button.js b/js/bootstrap-button.js index 6b36753d8..77af03760 100644 --- a/js/bootstrap-button.js +++ b/js/bootstrap-button.js @@ -17,7 +17,8 @@ * limitations under the License. * ============================================================ */ -!function( $ ){ + +!function ( $ ) { "use strict" diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index 8ce7418d2..0c8c5a202 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -18,7 +18,7 @@ * ========================================================== */ -!function( $ ){ +!function ( $ ) { "use strict" diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 478eea391..9f462e6bc 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -17,7 +17,8 @@ * limitations under the License. * ============================================================ */ -!function( $ ){ + +!function ( $ ) { "use strict" diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js index f26b83f41..661b22713 100644 --- a/js/bootstrap-dropdown.js +++ b/js/bootstrap-dropdown.js @@ -18,7 +18,7 @@ * ============================================================ */ -!function( $ ){ +!function ( $ ) { "use strict" diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index 3e0fb1481..f16b56500 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -18,7 +18,7 @@ * ========================================================= */ -!function( $ ){ +!function ( $ ) { "use strict" diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index 6f389785c..ee47e43a2 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -18,7 +18,7 @@ * =========================================================== */ -!function( $ ) { +!function ( $ ) { "use strict" diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js index c02e263b0..518ccafb2 100644 --- a/js/bootstrap-scrollspy.js +++ b/js/bootstrap-scrollspy.js @@ -17,6 +17,7 @@ * limitations under the License. * ============================================================== */ + !function ( $ ) { "use strict" diff --git a/js/bootstrap-tab.js b/js/bootstrap-tab.js index 974cc0aca..d46ef790a 100644 --- a/js/bootstrap-tab.js +++ b/js/bootstrap-tab.js @@ -18,7 +18,7 @@ * ======================================================== */ -!function( $ ){ +!function ( $ ) { "use strict" diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js index 7d58a6c8d..4704d1e02 100644 --- a/js/bootstrap-tooltip.js +++ b/js/bootstrap-tooltip.js @@ -18,7 +18,8 @@ * limitations under the License. * ========================================================== */ -!function( $ ) { + +!function ( $ ) { "use strict" diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js index f5226f96d..f73de1c58 100644 --- a/js/bootstrap-transition.js +++ b/js/bootstrap-transition.js @@ -17,7 +17,8 @@ * limitations under the License. * ========================================================== */ -!function( $ ) { + +!function ( $ ) { $(function () { diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js index f4d26186c..f366bea63 100644 --- a/js/bootstrap-typeahead.js +++ b/js/bootstrap-typeahead.js @@ -17,6 +17,7 @@ * limitations under the License. * ============================================================ */ + !function( $ ){ "use strict" @@ -78,7 +79,7 @@ } items = $.grep(this.source, function (item) { - if (that.matcher(item)) return item + return that.matcher(item) }) items = this.sorter(items) -- cgit v1.2.3 From 0dfff052cb27efdb81883449112adf6e0960aea4 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 24 Mar 2012 19:02:55 -0700 Subject: add MSTransitionEnd event to js plugin --- js/bootstrap-transition.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'js') diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js index f73de1c58..574f9915d 100644 --- a/js/bootstrap-transition.js +++ b/js/bootstrap-transition.js @@ -39,6 +39,8 @@ transitionEnd = "webkitTransitionEnd" } else if ( $.browser.mozilla ) { transitionEnd = "transitionend" + else if ( $.browser.msie ) { + transitionEnd = "MSTransitionEnd" } else if ( $.browser.opera ) { transitionEnd = "oTransitionEnd" } -- cgit v1.2.3 From 3e7920820a4c8b93282628ade9281ff0d4484a45 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 24 Mar 2012 20:01:51 -0700 Subject: add missing closing brace --- js/bootstrap-transition.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js') diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js index 574f9915d..8c82cc311 100644 --- a/js/bootstrap-transition.js +++ b/js/bootstrap-transition.js @@ -39,7 +39,7 @@ transitionEnd = "webkitTransitionEnd" } else if ( $.browser.mozilla ) { transitionEnd = "transitionend" - else if ( $.browser.msie ) { + } else if ( $.browser.msie ) { transitionEnd = "MSTransitionEnd" } else if ( $.browser.opera ) { transitionEnd = "oTransitionEnd" -- cgit v1.2.3 From 8ea8c312ea631ec7f8c80ae8751da18e93094a4e Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 29 Mar 2012 12:35:06 -0700 Subject: replace UA sniffing --- js/bootstrap-transition.js | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) (limited to 'js') diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js index 8c82cc311..7b0113484 100644 --- a/js/bootstrap-transition.js +++ b/js/bootstrap-transition.js @@ -24,28 +24,35 @@ "use strict" - /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) + /* CSS TRANSITION SUPPORT (technique from http://www.modernizr.com/) * ======================================================= */ $.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.msie ) { - transitionEnd = "MSTransitionEnd" - } else if ( $.browser.opera ) { - transitionEnd = "oTransitionEnd" + var el = document.createElement('bootstrap') + , transEndEventNames = { + 'WebkitTransition' : 'webkitTransitionEnd' + , 'MozTransition' : 'transitionend' + , 'OTransition' : 'oTransitionEnd' + , 'msTransition' : 'MsTransitionEnd' + , 'transition' : 'transitionend' + } + , name + + for (name in transEndEventNames){ + if (el.style[name] !== undefined) { + return transEndEventNames[name] + } } - return transitionEnd + }()) + } })() -- cgit v1.2.3 From 30b3f47e31487b9f7db6a42ed633597c3f5e764c Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 29 Mar 2012 12:48:37 -0700 Subject: remove "technique" --- js/bootstrap-transition.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js') diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js index 7b0113484..028b03c84 100644 --- a/js/bootstrap-transition.js +++ b/js/bootstrap-transition.js @@ -24,7 +24,7 @@ "use strict" - /* CSS TRANSITION SUPPORT (technique from http://www.modernizr.com/) + /* CSS TRANSITION SUPPORT (http://www.modernizr.com/) * ======================================================= */ $.support.transition = (function () { -- cgit v1.2.3 From 422d04cb2b59ced380c2fa6dcb637dab70a916a3 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 29 Mar 2012 13:51:23 -0700 Subject: simplify transition plugin a little --- js/bootstrap-transition.js | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) (limited to 'js') diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js index 028b03c84..b87d60071 100644 --- a/js/bootstrap-transition.js +++ b/js/bootstrap-transition.js @@ -29,31 +29,30 @@ $.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 el = document.createElement('bootstrap') - , transEndEventNames = { - 'WebkitTransition' : 'webkitTransitionEnd' - , 'MozTransition' : 'transitionend' - , 'OTransition' : 'oTransitionEnd' - , 'msTransition' : 'MsTransitionEnd' - , 'transition' : 'transitionend' - } - , name - - for (name in transEndEventNames){ - if (el.style[name] !== undefined) { - return transEndEventNames[name] + var transitionEnd = (function () { + + var el = document.createElement('bootstrap') + , transEndEventNames = { + 'WebkitTransition' : 'webkitTransitionEnd' + , 'MozTransition' : 'transitionend' + , 'OTransition' : 'oTransitionEnd' + , 'msTransition' : 'MsTransitionEnd' + , 'transition' : 'transitionend' } + , name + + for (name in transEndEventNames){ + if (el.style[name] !== undefined) { + return transEndEventNames[name] } + } - }()) + })() + return transitionEnd && { + end: transitionEnd } + })() }) -- cgit v1.2.3 From 0665c3ebf781e228b32c5714dd36f5279b4fb211 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 29 Mar 2012 13:55:56 -0700 Subject: move over paren just because. --- js/bootstrap-transition.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js') diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js index b87d60071..805f314be 100644 --- a/js/bootstrap-transition.js +++ b/js/bootstrap-transition.js @@ -47,7 +47,7 @@ } } - })() + }()) return transitionEnd && { end: transitionEnd -- cgit v1.2.3 From 2dc979a2029d909945011a8e6dac3543aa9f0198 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 29 Mar 2012 14:14:17 -0700 Subject: MSTransitionEnd + move paren (thanks rick waldron) --- js/bootstrap-transition.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js') diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js index 805f314be..8ff3c9002 100644 --- a/js/bootstrap-transition.js +++ b/js/bootstrap-transition.js @@ -36,7 +36,7 @@ 'WebkitTransition' : 'webkitTransitionEnd' , 'MozTransition' : 'transitionend' , 'OTransition' : 'oTransitionEnd' - , 'msTransition' : 'MsTransitionEnd' + , 'msTransition' : 'MSTransitionEnd' , 'transition' : 'transitionend' } , name -- cgit v1.2.3 From 4bd611884a5f1dd02878f73bccd51d85c1e49186 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 4 Apr 2012 14:58:04 -0700 Subject: detect if title in tooltip is text or html. if text - use `text` method to prevent xss. all add a few notes to js readme about updated event --- js/README.md | 10 ++++++++-- js/bootstrap-tooltip.js | 14 +++++++++++++- js/tests/unit/bootstrap-tooltip.js | 24 ++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 3 deletions(-) (limited to 'js') diff --git a/js/README.md b/js/README.md index 1c3ced31f..c7b71e70f 100644 --- a/js/README.md +++ b/js/README.md @@ -5,7 +5,7 @@ These are the high-level design rules which guide the development of Bootstrap's ### DATA-ATTRIBUTE API -We believe you should be able to use all plugins provided by Bootstrap purely through the markup API without writing a single line of javascript. +We believe you should be able to use all plugins provided by Bootstrap purely through the markup API without writing a single line of javascript. This is bootstraps first class api. We acknowledge that this isn't always the most performant and sometimes it may be desirable to turn this functionality off altogether. Therefore, as of 2.0 we provide the ability to disable the data attribute API by unbinding all events on the body namespaced with `'data-api'`. This looks like this: @@ -29,7 +29,7 @@ All methods should accept an optional options object, a string which targets a p $("#myModal").modal() // initialized with defaults $("#myModal").modal({ keyboard: false }) // initialized with no keyboard - $("#myModal").modal('show') // initializes and invokes show immediately afterqwe2 + $("#myModal").modal('show') // initializes and invokes show immediately --- @@ -60,6 +60,12 @@ All events should have an infinitive and past participle form. The infinitive is show | shown hide | hidden +All infinitive events should provide preventDefault functionality. This provides the abililty to stop the execution of an action. + + $('#myModal').on('show', function (e) { + if (!data) return e.preventDefault() // stops modal from being shown + }) + --- ### CONSTRUCTORS diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js index 4704d1e02..63e903cb4 100644 --- a/js/bootstrap-tooltip.js +++ b/js/bootstrap-tooltip.js @@ -155,9 +155,21 @@ } } + , isHTML: function( text ) { + // html string detection logic adapted from jQuery + return typeof text != 'string' + || ( text.charAt(0) === "<" + && text.charAt( text.length - 1 ) === ">" + && text.length >= 3 + ) || /^(?:[^<]*<[\w\W]+>[^>]*$)/.exec(text) + } + , setContent: function () { var $tip = this.tip() - $tip.find('.tooltip-inner').html(this.getTitle()) + , title = this.getTitle() + , isHTML = this.isHTML(title) + + $tip.find('.tooltip-inner')[isHTML ? 'html' : 'text'](title) $tip.removeClass('fade in top bottom left right') } diff --git a/js/tests/unit/bootstrap-tooltip.js b/js/tests/unit/bootstrap-tooltip.js index 8543162c6..f6e00089b 100644 --- a/js/tests/unit/bootstrap-tooltip.js +++ b/js/tests/unit/bootstrap-tooltip.js @@ -59,4 +59,28 @@ $(function () { ok(!$(".tooltip").length, 'tooltip removed') }) + test("should detect if title string is html or text: foo", function () { + ok(!$.fn.tooltip.Constructor.prototype.isHTML('foo'), 'correctly detected html') + }) + + test("should detect if title string is html or text: &lt;foo&gt;", function () { + ok(!$.fn.tooltip.Constructor.prototype.isHTML('<foo>'), 'correctly detected html') + }) + + test("should detect if title string is html or text: <div>foo</div>", function () { + ok($.fn.tooltip.Constructor.prototype.isHTML('
foo
'), 'correctly detected html') + }) + + test("should detect if title string is html or text: asdfa<div>foo</div>asdfasdf", function () { + ok($.fn.tooltip.Constructor.prototype.isHTML('asdfa
foo
asdfasdf'), 'correctly detected html') + }) + + test("should detect if title string is html or text: document.createElement('div')", function () { + ok($.fn.tooltip.Constructor.prototype.isHTML(document.createElement('div')), 'correctly detected html') + }) + + test("should detect if title string is html or text: $('<div />)", function () { + ok($.fn.tooltip.Constructor.prototype.isHTML($('
')), 'correctly detected html') + }) + }) \ No newline at end of file -- cgit v1.2.3 From 83febb3452ecd81241ddc004509ec64de8b13a92 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 4 Apr 2012 15:02:30 -0700 Subject: remake and add isHTML check to popover as well --- js/bootstrap-popover.js | 4 ++-- js/bootstrap-tooltip.js | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'js') diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index ee47e43a2..df6ef3dff 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -38,8 +38,8 @@ , title = this.getTitle() , content = this.getContent() - $tip.find('.popover-title').html(title) - $tip.find('.popover-content > *').html(content) + $tip.find('.popover-title')[this.isHTML(title) ? 'html' : 'text'](title) + $tip.find('.popover-content > *')[this.isHTML(content) ? 'html' : 'text'](content) $tip.removeClass('fade top bottom left right in') } diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js index 63e903cb4..2f9254ed2 100644 --- a/js/bootstrap-tooltip.js +++ b/js/bootstrap-tooltip.js @@ -167,9 +167,8 @@ , setContent: function () { var $tip = this.tip() , title = this.getTitle() - , isHTML = this.isHTML(title) - $tip.find('.tooltip-inner')[isHTML ? 'html' : 'text'](title) + $tip.find('.tooltip-inner')[this.isHTML(title) ? 'html' : 'text'](title) $tip.removeClass('fade in top bottom left right') } -- cgit v1.2.3 From 08fee005a8a879498255611c18dede3112896d3d Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 7 Apr 2012 21:26:46 -0700 Subject: https://github.com/twitter/bootstrap/issues/2954 --- js/bootstrap-typeahead.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'js') diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js index f366bea63..3876e6307 100644 --- a/js/bootstrap-typeahead.js +++ b/js/bootstrap-typeahead.js @@ -204,11 +204,13 @@ break case 38: // up arrow + if (e.type != 'keydown') break e.preventDefault() this.prev() break case 40: // down arrow + if (e.type != 'keydown') break e.preventDefault() this.next() break -- cgit v1.2.3 From 575f18aaf49abb0289185f6409bee031947ccf69 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 14 Apr 2012 16:29:53 -0700 Subject: add jshint support + a few minor stylistic changes --- js/.jshintrc | 9 ++++++ js/bootstrap-alert.js | 55 +++++++++++++++----------------- js/bootstrap-button.js | 59 ++++++++++++++++------------------- js/bootstrap-carousel.js | 9 +++--- js/bootstrap-collapse.js | 34 +++++++++++--------- js/bootstrap-dropdown.js | 16 +++++----- js/bootstrap-modal.js | 21 +++++++------ js/bootstrap-popover.js | 15 ++++++--- js/bootstrap-scrollspy.js | 7 +++-- js/bootstrap-tab.js | 7 +++-- js/bootstrap-tooltip.js | 25 ++++++++------- js/bootstrap-transition.js | 7 +++-- js/bootstrap-typeahead.js | 16 ++++++---- js/tests/unit/bootstrap-transition.js | 2 +- 14 files changed, 152 insertions(+), 130 deletions(-) create mode 100644 js/.jshintrc (limited to 'js') diff --git a/js/.jshintrc b/js/.jshintrc new file mode 100644 index 000000000..bb41ef9cc --- /dev/null +++ b/js/.jshintrc @@ -0,0 +1,9 @@ +{ + "browser" : true, + "expr" : true, + "laxbreak" : true, + "boss" : true, + "asi" : true, + "laxcomma" : true, + "validthis": true +} \ No newline at end of file diff --git a/js/bootstrap-alert.js b/js/bootstrap-alert.js index c7171855d..167a57f84 100644 --- a/js/bootstrap-alert.js +++ b/js/bootstrap-alert.js @@ -18,9 +18,10 @@ * ========================================================== */ -!function ( $ ) { +!function ($) { + + "use strict"; // jshint ;_; - "use strict" /* ALERT CLASS DEFINITION * ====================== */ @@ -30,43 +31,37 @@ $(el).on('click', dismiss, this.close) } - Alert.prototype = { - - constructor: Alert - - , close: function ( e ) { - var $this = $(this) - , selector = $this.attr('data-target') - , $parent - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } + Alert.prototype.close = function (e) { + var $this = $(this) + , selector = $this.attr('data-target') + , $parent - $parent = $(selector) + if (!selector) { + selector = $this.attr('href') + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + } - e && e.preventDefault() + $parent = $(selector) - $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) + e && e.preventDefault() - $parent.trigger(e = $.Event('close')) + $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) - if (e.isDefaultPrevented()) return + $parent.trigger(e = $.Event('close')) - $parent.removeClass('in') + if (e.isDefaultPrevented()) return - function removeElement() { - $parent - .trigger('closed') - .remove() - } + $parent.removeClass('in') - $.support.transition && $parent.hasClass('fade') ? - $parent.on($.support.transition.end, removeElement) : - removeElement() + function removeElement() { + $parent + .trigger('closed') + .remove() } + $.support.transition && $parent.hasClass('fade') ? + $parent.on($.support.transition.end, removeElement) : + removeElement() } @@ -92,4 +87,4 @@ $('body').on('click.alert.data-api', dismiss, Alert.prototype.close) }) -}( window.jQuery ); \ No newline at end of file +}(window.jQuery); \ No newline at end of file diff --git a/js/bootstrap-button.js b/js/bootstrap-button.js index 77af03760..49e88e49a 100644 --- a/js/bootstrap-button.js +++ b/js/bootstrap-button.js @@ -18,58 +18,53 @@ * ============================================================ */ -!function ( $ ) { +!function ($) { + + "use strict"; // jshint ;_; - "use strict" /* BUTTON PUBLIC CLASS DEFINITION * ============================== */ - var Button = function ( element, options ) { + var Button = function (element, options) { this.$element = $(element) this.options = $.extend({}, $.fn.button.defaults, options) } - Button.prototype = { - - constructor: Button - - , setState: function ( state ) { - var d = 'disabled' - , $el = this.$element - , data = $el.data() - , val = $el.is('input') ? 'val' : 'html' + Button.prototype.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]()) + state = state + 'Text' + data.resetText || $el.data('resetText', $el[val]()) - $el[val](data[state] || this.options[state]) + $el[val](data[state] || this.options[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"]') + // 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) + } - $parent && $parent - .find('.active') - .removeClass('active') + Button.prototype.toggle = function () { + var $parent = this.$element.parent('[data-toggle="buttons-radio"]') - this.$element.toggleClass('active') - } + $parent && $parent + .find('.active') + .removeClass('active') + this.$element.toggleClass('active') } /* BUTTON PLUGIN DEFINITION * ======================== */ - $.fn.button = function ( option ) { + $.fn.button = function (option) { return this.each(function () { var $this = $(this) , data = $this.data('button') @@ -98,4 +93,4 @@ }) }) -}( window.jQuery ); \ No newline at end of file +}(window.jQuery); \ No newline at end of file diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index 0c8c5a202..d1c3079e4 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -18,9 +18,10 @@ * ========================================================== */ -!function ( $ ) { +!function ($) { + + "use strict"; // jshint ;_; - "use strict" /* CAROUSEL CLASS DEFINITION * ========================= */ @@ -129,7 +130,7 @@ /* CAROUSEL PLUGIN DEFINITION * ========================== */ - $.fn.carousel = function ( option ) { + $.fn.carousel = function (option) { return this.each(function () { var $this = $(this) , data = $this.data('carousel') @@ -162,4 +163,4 @@ }) }) -}( window.jQuery ); \ No newline at end of file +}(window.jQuery); \ No newline at end of file diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 9f462e6bc..30e139cf8 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -18,16 +18,20 @@ * ============================================================ */ -!function ( $ ) { +!function ($) { - "use strict" + "use strict"; // jshint ;_; - var Collapse = function ( element, options ) { - this.$element = $(element) + + /* COLLAPSE PUBLIC CLASS DEFINITION + * ================================ */ + + var Collapse = function (element, options) { + this.$element = $(element) this.options = $.extend({}, $.fn.collapse.defaults, options) - if (this.options["parent"]) { - this.$parent = $(this.options["parent"]) + if (this.options.parent) { + this.$parent = $(this.options.parent) } this.options.toggle && this.toggle() @@ -53,7 +57,6 @@ dimension = this.dimension() scroll = $.camelCase(['scroll', dimension].join('-')) actives = this.$parent && this.$parent.find('> .accordion-group > .in') - hasData if (actives && actives.length) { hasData = actives.data('collapse') @@ -75,7 +78,7 @@ this.$element[dimension](0) } - , reset: function ( size ) { + , reset: function (size) { var dimension = this.dimension() this.$element @@ -83,12 +86,12 @@ [dimension](size || 'auto') [0].offsetWidth - this.$element[size != null ? 'addClass' : 'removeClass']('collapse') + this.$element[size !== null ? 'addClass' : 'removeClass']('collapse') return this } - , transition: function ( method, startEvent, completeEvent ) { + , transition: function (method, startEvent, completeEvent) { var that = this , complete = function () { if (startEvent == 'show') that.reset() @@ -107,18 +110,19 @@ $.support.transition && this.$element.hasClass('collapse') ? this.$element.one($.support.transition.end, complete) : complete() - } + } , toggle: function () { this[this.$element.hasClass('in') ? 'hide' : 'show']() - } + } } - /* COLLAPSIBLE PLUGIN DEFINITION + + /* COLLAPSIBLE PLUGIN DEFINITION * ============================== */ - $.fn.collapse = function ( option ) { + $.fn.collapse = function (option) { return this.each(function () { var $this = $(this) , data = $this.data('collapse') @@ -149,4 +153,4 @@ }) }) -}( window.jQuery ); \ No newline at end of file +}(window.jQuery); \ No newline at end of file diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js index 661b22713..f27f4d2f4 100644 --- a/js/bootstrap-dropdown.js +++ b/js/bootstrap-dropdown.js @@ -18,15 +18,16 @@ * ============================================================ */ -!function ( $ ) { +!function ($) { + + "use strict"; // jshint ;_; - "use strict" /* DROPDOWN CLASS DEFINITION * ========================= */ var toggle = '[data-toggle="dropdown"]' - , Dropdown = function ( element ) { + , Dropdown = function (element) { var $el = $(element).on('click.dropdown.data-api', this.toggle) $('html').on('click.dropdown.data-api', function () { $el.parent().removeClass('open') @@ -37,7 +38,7 @@ constructor: Dropdown - , toggle: function ( e ) { + , toggle: function (e) { var $this = $(this) , selector = $this.attr('data-target') , $parent @@ -54,7 +55,8 @@ isActive = $parent.hasClass('open') clearMenus() - !isActive && $parent.toggleClass('open') + + if (!isActive) $parent.toggleClass('open') return false } @@ -69,7 +71,7 @@ /* DROPDOWN PLUGIN DEFINITION * ========================== */ - $.fn.dropdown = function ( option ) { + $.fn.dropdown = function (option) { return this.each(function () { var $this = $(this) , data = $this.data('dropdown') @@ -91,4 +93,4 @@ .on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle) }) -}( window.jQuery ); \ No newline at end of file +}(window.jQuery); \ No newline at end of file diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index f16b56500..959433f2a 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -18,14 +18,15 @@ * ========================================================= */ -!function ( $ ) { +!function ($) { + + "use strict"; // jshint ;_; - "use strict" /* MODAL CLASS DEFINITION * ====================== */ - var Modal = function ( content, options ) { + var Modal = function (content, options) { this.options = options this.$element = $(content) .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this)) @@ -55,7 +56,9 @@ backdrop.call(this, function () { var transition = $.support.transition && that.$element.hasClass('fade') - !that.$element.parent().length && that.$element.appendTo(document.body) //don't move modals dom position + if (!that.$element.parent().length) { + that.$element.appendTo(document.body) //don't move modals dom position + } that.$element .show() @@ -73,7 +76,7 @@ }) } - , hide: function ( e ) { + , hide: function (e) { e && e.preventDefault() var that = this @@ -116,7 +119,7 @@ }) } - function hideModal( that ) { + function hideModal(that) { this.$element .hide() .trigger('hidden') @@ -124,7 +127,7 @@ backdrop.call(this) } - function backdrop( callback ) { + function backdrop(callback) { var that = this , animate = this.$element.hasClass('fade') ? 'fade' : '' @@ -178,7 +181,7 @@ /* MODAL PLUGIN DEFINITION * ======================= */ - $.fn.modal = function ( option ) { + $.fn.modal = function (option) { return this.each(function () { var $this = $(this) , data = $this.data('modal') @@ -212,4 +215,4 @@ }) }) -}( window.jQuery ); \ No newline at end of file +}(window.jQuery); \ No newline at end of file diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index df6ef3dff..51820979a 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -18,14 +18,19 @@ * =========================================================== */ -!function ( $ ) { +!function ($) { - "use strict" + "use strict"; // jshint ;_; + + + /* POPOVER PUBLIC CLASS DEFINITION + * =============================== */ var Popover = function ( element, options ) { this.init('popover', element, options) } + /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js ========================================== */ @@ -59,7 +64,7 @@ return content } - , tip: function() { + , tip: function () { if (!this.$tip) { this.$tip = $(this.options.template) } @@ -72,7 +77,7 @@ /* POPOVER PLUGIN DEFINITION * ======================= */ - $.fn.popover = function ( option ) { + $.fn.popover = function (option) { return this.each(function () { var $this = $(this) , data = $this.data('popover') @@ -90,4 +95,4 @@ , template: '

' }) -}( window.jQuery ); \ No newline at end of file +}(window.jQuery); \ No newline at end of file diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js index 518ccafb2..3dee609c7 100644 --- a/js/bootstrap-scrollspy.js +++ b/js/bootstrap-scrollspy.js @@ -18,9 +18,10 @@ * ============================================================== */ -!function ( $ ) { +!function ($) { + + "use strict"; // jshint ;_; - "use strict" /* SCROLLSPY CLASS DEFINITION * ========================== */ @@ -142,4 +143,4 @@ }) }) -}( window.jQuery ); \ No newline at end of file +}(window.jQuery); \ No newline at end of file diff --git a/js/bootstrap-tab.js b/js/bootstrap-tab.js index d46ef790a..6255d53ef 100644 --- a/js/bootstrap-tab.js +++ b/js/bootstrap-tab.js @@ -18,9 +18,10 @@ * ======================================================== */ -!function ( $ ) { +!function ($) { + + "use strict"; // jshint ;_; - "use strict" /* TAB CLASS DEFINITION * ==================== */ @@ -131,4 +132,4 @@ }) }) -}( window.jQuery ); \ No newline at end of file +}(window.jQuery); \ No newline at end of file diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js index 2f9254ed2..454e7a448 100644 --- a/js/bootstrap-tooltip.js +++ b/js/bootstrap-tooltip.js @@ -19,14 +19,15 @@ * ========================================================== */ -!function ( $ ) { +!function ($) { + + "use strict"; // jshint ;_; - "use strict" /* TOOLTIP PUBLIC CLASS DEFINITION * =============================== */ - var Tooltip = function ( element, options ) { + var Tooltip = function (element, options) { this.init('tooltip', element, options) } @@ -34,7 +35,7 @@ constructor: Tooltip - , init: function ( type, element, options ) { + , init: function (type, element, options) { var eventIn , eventOut @@ -55,7 +56,7 @@ this.fixTitle() } - , getOptions: function ( options ) { + , getOptions: function (options) { options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data()) if (options.delay && typeof options.delay == 'number') { @@ -68,7 +69,7 @@ return options } - , enter: function ( e ) { + , enter: function (e) { var self = $(e.currentTarget)[this.type](this._options).data(this.type) if (!self.options.delay || !self.options.delay.show) { @@ -84,7 +85,7 @@ } } - , leave: function ( e ) { + , leave: function (e) { var self = $(e.currentTarget)[this.type](this._options).data(this.type) if (!self.options.delay || !self.options.delay.hide) { @@ -155,7 +156,7 @@ } } - , isHTML: function( text ) { + , isHTML: function(text) { // html string detection logic adapted from jQuery return typeof text != 'string' || ( text.charAt(0) === "<" @@ -271,12 +272,12 @@ $.fn.tooltip.defaults = { animation: true - , delay: 0 - , selector: false , placement: 'top' + , selector: false + , template: '
' , trigger: 'hover' , title: '' - , template: '
' + , delay: 0 } -}( window.jQuery ); \ No newline at end of file +}(window.jQuery); \ No newline at end of file diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js index 8ff3c9002..d34caa1b9 100644 --- a/js/bootstrap-transition.js +++ b/js/bootstrap-transition.js @@ -18,11 +18,12 @@ * ========================================================== */ -!function ( $ ) { +!function ($) { $(function () { - "use strict" + "use strict"; // jshint ;_; + /* CSS TRANSITION SUPPORT (http://www.modernizr.com/) * ======================================================= */ @@ -57,4 +58,4 @@ }) -}( window.jQuery ); \ No newline at end of file +}(window.jQuery); \ No newline at end of file diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js index 3876e6307..526cf320c 100644 --- a/js/bootstrap-typeahead.js +++ b/js/bootstrap-typeahead.js @@ -18,11 +18,15 @@ * ============================================================ */ -!function( $ ){ +!function($){ - "use strict" + "use strict"; // jshint ;_; - var Typeahead = function ( element, options ) { + + /* TYPEAHEAD PUBLIC CLASS DEFINITION + * ================================= */ + + var Typeahead = function (element, options) { this.$element = $(element) this.options = $.extend({}, $.fn.typeahead.defaults, options) this.matcher = this.options.matcher || this.matcher @@ -111,7 +115,7 @@ } , highlighter: function (item) { - var query = this.query.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&') + var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&') return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) { return '' + match + '' }) @@ -241,7 +245,7 @@ /* TYPEAHEAD PLUGIN DEFINITION * =========================== */ - $.fn.typeahead = function ( option ) { + $.fn.typeahead = function (option) { return this.each(function () { var $this = $(this) , data = $this.data('typeahead') @@ -273,4 +277,4 @@ }) }) -}( window.jQuery ); \ No newline at end of file +}(window.jQuery); \ No newline at end of file diff --git a/js/tests/unit/bootstrap-transition.js b/js/tests/unit/bootstrap-transition.js index 3f28d2676..086773fa2 100644 --- a/js/tests/unit/bootstrap-transition.js +++ b/js/tests/unit/bootstrap-transition.js @@ -3,7 +3,7 @@ $(function () { module("bootstrap-transition") test("should be defined on jquery support object", function () { - ok($.support.transition != undefined, 'transition object is defined') + ok($.support.transition !== undefined, 'transition object is defined') }) test("should provide an end object", function () { -- cgit v1.2.3 From c291e4d78681b5111b4a2c7f480bd7bf18abc34c Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 14 Apr 2012 16:32:20 -0700 Subject: fix typeahead test --- js/tests/unit/bootstrap-typeahead.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js') diff --git a/js/tests/unit/bootstrap-typeahead.js b/js/tests/unit/bootstrap-typeahead.js index 25d313c85..4e2428d6a 100644 --- a/js/tests/unit/bootstrap-typeahead.js +++ b/js/tests/unit/bootstrap-typeahead.js @@ -107,7 +107,7 @@ $(function () { ok(typeahead.$menu.find('li').first().hasClass('active'), "first item is active") $input.trigger({ - type: 'keypress' + type: 'keydown' , keyCode: 40 }) @@ -115,7 +115,7 @@ $(function () { $input.trigger({ - type: 'keypress' + type: 'keydown' , keyCode: 38 }) -- cgit v1.2.3 From 81a296d06ab4e445918c41bc885a610d55a33271 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 14 Apr 2012 16:38:44 -0700 Subject: whitespace --- js/.jshintrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js') diff --git a/js/.jshintrc b/js/.jshintrc index bb41ef9cc..e93a8deee 100644 --- a/js/.jshintrc +++ b/js/.jshintrc @@ -1,5 +1,5 @@ { - "browser" : true, + "browser" : true, "expr" : true, "laxbreak" : true, "boss" : true, -- cgit v1.2.3 From 82267d48ffb522ed4c9cb491660f7d1c8a9e0236 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 14 Apr 2012 17:49:51 -0700 Subject: calling pause on a slide should actually pause it - even when hovering --- js/.jshintrc | 11 ++++++----- js/bootstrap-carousel.js | 7 +++++-- 2 files changed, 11 insertions(+), 7 deletions(-) (limited to 'js') diff --git a/js/.jshintrc b/js/.jshintrc index e93a8deee..bbac349e8 100644 --- a/js/.jshintrc +++ b/js/.jshintrc @@ -1,9 +1,10 @@ { - "browser" : true, - "expr" : true, + "validthis": true, + "laxcomma" : true, "laxbreak" : true, + "browser" : true, + "debug" : true, "boss" : true, - "asi" : true, - "laxcomma" : true, - "validthis": true + "expr" : true, + "asi" : true } \ No newline at end of file diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index d1c3079e4..90f43a3eb 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -37,8 +37,10 @@ Carousel.prototype = { - cycle: function () { + cycle: function (e) { + if (!e) this.paused = false this.options.interval + && !this.paused && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) return this } @@ -64,7 +66,8 @@ return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos])) } - , pause: function () { + , pause: function (e) { + if (!e) this.paused = true clearInterval(this.interval) this.interval = null return this -- cgit v1.2.3 From d65f7f204a918906d7ce5120b9719abf105d60c5 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 14 Apr 2012 21:44:57 -0700 Subject: don't open dropdown if target is disabled --- js/bootstrap-dropdown.js | 6 +++++- js/tests/unit/bootstrap-dropdown.js | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) (limited to 'js') diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js index f27f4d2f4..411c2f7bf 100644 --- a/js/bootstrap-dropdown.js +++ b/js/bootstrap-dropdown.js @@ -40,10 +40,14 @@ , toggle: function (e) { var $this = $(this) - , selector = $this.attr('data-target') + , selector , $parent , isActive + if ($this.is('.disabled, :disabled')) return + + selector = $this.attr('data-target') + if (!selector) { selector = $this.attr('href') selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 diff --git a/js/tests/unit/bootstrap-dropdown.js b/js/tests/unit/bootstrap-dropdown.js index 368ced2a5..4e52c8485 100644 --- a/js/tests/unit/bootstrap-dropdown.js +++ b/js/tests/unit/bootstrap-dropdown.js @@ -10,6 +10,40 @@ $(function () { ok($(document.body).dropdown()[0] == document.body, 'document.body returned') }) + test("should not open dropdown if target is disabled", function () { + var dropdownHTML = '' + , dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click() + + ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class added on click') + }) + + test("should not open dropdown if target is disabled", function () { + var dropdownHTML = '' + , dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click() + + ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class added on click') + }) + test("should add class open to menu if clicked", function () { var dropdownHTML = '
    ' + '
  • ' -- cgit v1.2.3 From c7dc4cc573c61306ae849d316f432160b16a2099 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 14 Apr 2012 22:43:36 -0700 Subject: change position of var in dropdown + cleanup makefile vars --- js/bootstrap-dropdown.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js') diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js index 411c2f7bf..d856ba6ec 100644 --- a/js/bootstrap-dropdown.js +++ b/js/bootstrap-dropdown.js @@ -40,8 +40,8 @@ , toggle: function (e) { var $this = $(this) - , selector , $parent + , selector , isActive if ($this.is('.disabled, :disabled')) return -- cgit v1.2.3 From b14455b03a977cbbf99112d39b55461785666a3f Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 14 Apr 2012 23:10:03 -0700 Subject: add tests for mouseout delay in tooltip --- js/bootstrap-tooltip.js | 36 +++++++++++---------------- js/tests/unit/bootstrap-tooltip.js | 50 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 22 deletions(-) (limited to 'js') diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js index 454e7a448..af2e58968 100644 --- a/js/bootstrap-tooltip.js +++ b/js/bootstrap-tooltip.js @@ -72,33 +72,25 @@ , enter: function (e) { var self = $(e.currentTarget)[this.type](this._options).data(this.type) - if (!self.options.delay || !self.options.delay.show) { - self.show() - } else { - clearTimeout(this.timeout) - self.hoverState = 'in' - this.timeout = setTimeout(function() { - if (self.hoverState == 'in') { - self.show() - } - }, self.options.delay.show) - } + if (!self.options.delay || !self.options.delay.show) return self.show() + + clearTimeout(this.timeout) + self.hoverState = 'in' + this.timeout = setTimeout(function() { + if (self.hoverState == 'in') self.show() + }, self.options.delay.show) } , leave: function (e) { var self = $(e.currentTarget)[this.type](this._options).data(this.type) - if (!self.options.delay || !self.options.delay.hide) { - self.hide() - } else { - clearTimeout(this.timeout) - self.hoverState = 'out' - this.timeout = setTimeout(function() { - if (self.hoverState == 'out') { - self.hide() - } - }, self.options.delay.hide) - } + if (!self.options.delay || !self.options.delay.hide) return self.hide() + + clearTimeout(this.timeout) + self.hoverState = 'out' + this.timeout = setTimeout(function() { + if (self.hoverState == 'out') self.hide() + }, self.options.delay.hide) } , show: function () { diff --git a/js/tests/unit/bootstrap-tooltip.js b/js/tests/unit/bootstrap-tooltip.js index f6e00089b..63f4f0b07 100644 --- a/js/tests/unit/bootstrap-tooltip.js +++ b/js/tests/unit/bootstrap-tooltip.js @@ -59,6 +59,56 @@ $(function () { ok(!$(".tooltip").length, 'tooltip removed') }) + test("should not show tooltip if leave event occurs before delay expires", function () { + var tooltip = $('') + .appendTo('#qunit-fixture') + .tooltip({ delay: 200 }) + + stop() + + tooltip.trigger('mouseenter') + + setTimeout(function () { + ok(!$(".tooltip").hasClass('fade in'), 'tooltip is not faded in') + tooltip.trigger('mouseout') + setTimeout(function () { + ok(!$(".tooltip").hasClass('fade in'), 'tooltip is not faded in') + start() + }, 200) + }, 100) + }) + + test("should not show tooltip if leave event occurs before delay expires", function () { + var tooltip = $('') + .appendTo('#qunit-fixture') + .tooltip({ delay: 100 }) + stop() + tooltip.trigger('mouseenter') + setTimeout(function () { + ok(!$(".tooltip").hasClass('fade in'), 'tooltip is not faded in') + tooltip.trigger('mouseout') + setTimeout(function () { + ok(!$(".tooltip").hasClass('fade in'), 'tooltip is not faded in') + start() + }, 100) + }, 50) + }) + + test("should show tooltip if leave event hasn't occured before delay expires", function () { + var tooltip = $('') + .appendTo('#qunit-fixture') + .tooltip({ delay: 200 }) + stop() + tooltip.trigger('mouseenter') + setTimeout(function () { + ok(!$(".tooltip").hasClass('fade in'), 'tooltip is not faded in') + setTimeout(function () { + ok(!$(".tooltip").hasClass('fade in'), 'tooltip has faded in') + start() + }, 200) + }, 100) + }) + test("should detect if title string is html or text: foo", function () { ok(!$.fn.tooltip.Constructor.prototype.isHTML('foo'), 'correctly detected html') }) -- cgit v1.2.3 From 1ca1ef94ee80b8c5fa5f2a1e908a8d00fdfdf268 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 14 Apr 2012 23:24:19 -0700 Subject: fix opera bug \o/ !!!! #1776 --- js/bootstrap-scrollspy.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'js') diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js index 3dee609c7..f0400813f 100644 --- a/js/bootstrap-scrollspy.js +++ b/js/bootstrap-scrollspy.js @@ -94,12 +94,11 @@ this.activeTarget = target - this.$body - .find(this.selector).parent('.active') + $(this.selector) + .parent('.active') .removeClass('active') - active = this.$body - .find(this.selector + '[href="' + target + '"]') + active = $(this.selector + '[href="' + target + '"]') .parent('li') .addClass('active') -- cgit v1.2.3 From be0efcfcfca603bc65484464e0aeaf7b2fc145c2 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 14 Apr 2012 23:38:11 -0700 Subject: whitespace --- js/bootstrap-scrollspy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js') diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js index f0400813f..c67f1c8aa 100644 --- a/js/bootstrap-scrollspy.js +++ b/js/bootstrap-scrollspy.js @@ -102,7 +102,7 @@ .parent('li') .addClass('active') - if ( active.parent('.dropdown-menu') ) { + if (active.parent('.dropdown-menu')) { active = active.closest('li.dropdown').addClass('active') } -- cgit v1.2.3 From 0b8042656fc52600e18fb1c7f54dbbe8a284e737 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 15 Apr 2012 16:15:32 -0700 Subject: fixes #2941 + whitespace in collapse --- js/bootstrap-alert.js | 4 ++-- js/bootstrap-collapse.js | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'js') diff --git a/js/bootstrap-alert.js b/js/bootstrap-alert.js index 167a57f84..56174955b 100644 --- a/js/bootstrap-alert.js +++ b/js/bootstrap-alert.js @@ -27,7 +27,7 @@ * ====================== */ var dismiss = '[data-dismiss="alert"]' - , Alert = function ( el ) { + , Alert = function (el) { $(el).on('click', dismiss, this.close) } @@ -68,7 +68,7 @@ /* ALERT PLUGIN DEFINITION * ======================= */ - $.fn.alert = function ( option ) { + $.fn.alert = function (option) { return this.each(function () { var $this = $(this) , data = $this.data('alert') diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 30e139cf8..41e097df3 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -60,6 +60,7 @@ if (actives && actives.length) { hasData = actives.data('collapse') + if (hasData && hasData.transitioning) return actives.collapse('hide') hasData || actives.data('collapse', null) } -- cgit v1.2.3 From 8e8b1ad03df4f1e723cb58696ebace642fce3946 Mon Sep 17 00:00:00 2001 From: Nirav Sanghani Date: Mon, 16 Apr 2012 17:05:35 -0700 Subject: Allow updater function (updates the value of the input field) to be overridden. --- js/bootstrap-typeahead.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'js') diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js index 526cf320c..4c562f753 100644 --- a/js/bootstrap-typeahead.js +++ b/js/bootstrap-typeahead.js @@ -32,6 +32,7 @@ this.matcher = this.options.matcher || this.matcher this.sorter = this.options.sorter || this.sorter this.highlighter = this.options.highlighter || this.highlighter + this.updater = this.options.updater || this.updater this.$menu = $(this.options.menu).appendTo('body') this.source = this.options.source this.shown = false @@ -45,11 +46,15 @@ , select: function () { var val = this.$menu.find('.active').attr('data-value') this.$element - .val(val) + .val(this.updater(val)) .change() return this.hide() } + , updater: function (item) { + return item + } + , show: function () { var pos = $.extend({}, this.$element.offset(), { height: this.$element[0].offsetHeight -- cgit v1.2.3 From 8f98c4fbf6085e613314892de5da871dce862b34 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 18 Apr 2012 13:15:13 -0700 Subject: offset -> position #3088 --- js/bootstrap-typeahead.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js') diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js index 4c562f753..429ea989b 100644 --- a/js/bootstrap-typeahead.js +++ b/js/bootstrap-typeahead.js @@ -56,7 +56,7 @@ } , show: function () { - var pos = $.extend({}, this.$element.offset(), { + var pos = $.extend({}, this.$element.position(), { height: this.$element[0].offsetHeight }) -- cgit v1.2.3 From bc07e2adae7bc61795d54681915d791aee41c49a Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 18 Apr 2012 13:35:14 -0700 Subject: allow for pushstate in scrollspy --- js/bootstrap-scrollspy.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'js') diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js index c67f1c8aa..5c19ae382 100644 --- a/js/bootstrap-scrollspy.js +++ b/js/bootstrap-scrollspy.js @@ -54,7 +54,8 @@ $targets = this.$body .find(this.selector) .map(function () { - var href = $(this).attr('href') + var $el = $(this) + , href = $el.data('target') || $el.attr('href') , $href = /^#\w/.test(href) && $(href) return ( $href && href.length @@ -91,6 +92,7 @@ , activate: function (target) { var active + , selector this.activeTarget = target @@ -98,7 +100,11 @@ .parent('.active') .removeClass('active') - active = $(this.selector + '[href="' + target + '"]') + selector = this.selector + + '[data-target="' + target + '"],' + + this.selector + '[href="' + target + '"]' + + active = $(selector) .parent('li') .addClass('active') -- cgit v1.2.3 From 03f78f7a60a631c01c1fb085b01d98bee61d7bb6 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 19 Apr 2012 17:34:07 -0700 Subject: run qunit tests in phantomjs for travis-ci --- js/tests/index.html | 3 ++ js/tests/phantom.js | 65 ++++++++++++++++++++++++++++++++++++++ js/tests/server.js | 18 +++++++++++ js/tests/unit/bootstrap-phantom.js | 21 ++++++++++++ 4 files changed, 107 insertions(+) create mode 100644 js/tests/phantom.js create mode 100644 js/tests/server.js create mode 100644 js/tests/unit/bootstrap-phantom.js (limited to 'js') diff --git a/js/tests/index.html b/js/tests/index.html index 3e6cb9777..2f8f71b12 100644 --- a/js/tests/index.html +++ b/js/tests/index.html @@ -11,6 +11,9 @@ + + + diff --git a/js/tests/phantom.js b/js/tests/phantom.js new file mode 100644 index 000000000..f172e7cbc --- /dev/null +++ b/js/tests/phantom.js @@ -0,0 +1,65 @@ +/* + * Simple phantom.js integration script + * Adapted from Modernizr + */ + +function waitFor(testFx, onReady, timeOutMillis) { + var maxtimeOutMillis = timeOutMillis ? timeOutMillis : 3001, //< Default Max Timout is 3s + start = new Date().getTime(), + condition = false, + interval = setInterval(function() { + if ( (new Date().getTime() - start < maxtimeOutMillis) && !condition ) { + // If not time-out yet and condition not yet fulfilled + condition = (typeof(testFx) === "string" ? eval(testFx) : testFx()); //< defensive code + } else { + if(!condition) { + // If condition still not fulfilled (timeout but condition is 'false') + console.log("'waitFor()' timeout"); + phantom.exit(1); + } else { + // Condition fulfilled (timeout and/or condition is 'true') + typeof(onReady) === "string" ? eval(onReady) : onReady(); //< Do what it's supposed to do once the condition is fulfilled + clearInterval(interval); //< Stop this interval + } + } + }, 100); //< repeat check every 250ms +}; + + +if (phantom.args.length === 0 || phantom.args.length > 2) { + console.log('Usage: phantom.js URL'); + phantom.exit(); +} + +var page = new WebPage(); + +// Route "console.log()" calls from within the Page context to the main Phantom context (i.e. current "this") +page.onConsoleMessage = function(msg) { + console.log(msg); +}; + +page.open(phantom.args[0], function(status){ + if (status !== "success") { + console.log("Unable to access network"); + phantom.exit(); + } else { + waitFor(function(){ + return page.evaluate(function(){ + var el = document.getElementById('qunit-testresult'); + if (el && el.innerText.match('completed')) { + return true; + } + return false; + }); + }, function(){ + var failedNum = page.evaluate(function(){ + var el = document.getElementById('qunit-testresult'); + try { + return el.getElementsByClassName('failed')[0].innerHTML; + } catch (e) { } + return 10000; + }); + phantom.exit((parseInt(failedNum, 10) > 0) ? 1 : 0); + }); + } +}); \ No newline at end of file diff --git a/js/tests/server.js b/js/tests/server.js new file mode 100644 index 000000000..27d1bf24b --- /dev/null +++ b/js/tests/server.js @@ -0,0 +1,18 @@ +/* + * Simple connect server for phantom.js + * Adapted from Modernizr + */ + +var connect = require('connect') + , args = process.argv.slice(2) + , fs = require('fs') + , folder = '/../../' + , port = '3000' + +var server = connect.createServer( + connect.static(__dirname + folder) +).listen(port) + +fs.writeFileSync(__dirname + '/pid.txt', process.pid, 'utf-8') + +console.log("Server started on port %s in %s", port, folder) \ No newline at end of file diff --git a/js/tests/unit/bootstrap-phantom.js b/js/tests/unit/bootstrap-phantom.js new file mode 100644 index 000000000..8bed5f603 --- /dev/null +++ b/js/tests/unit/bootstrap-phantom.js @@ -0,0 +1,21 @@ +// Logging setup for phantom integration +// adapted from Modernizr + +QUnit.begin = function() { + console.log("Starting test suite"); + console.log("================================================\n"); +}; + +QUnit.moduleDone = function(opts) { + if(opts.failed === 0) { + console.log("\u2714 All tests passed in '"+opts.name+"' module"); + } else { + console.log("\u2716 "+ opts.failed +" tests failed in '"+opts.name+"' module"); + } +}; + +QUnit.done = function(opts) { + console.log("\n================================================"); + console.log("Tests completed in "+opts.runtime+" milliseconds"); + console.log(opts.passed + " tests of "+opts.total+" passed, "+opts.failed+" failed."); +}; \ No newline at end of file -- cgit v1.2.3 From f84882122ef98500af143ddaaf055262cfbdf0c3 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 19 Apr 2012 17:40:58 -0700 Subject: style changes to phantom integration --- js/tests/phantom.js | 102 ++++++++++++++++++------------------- js/tests/unit/bootstrap-phantom.js | 32 ++++++------ 2 files changed, 66 insertions(+), 68 deletions(-) (limited to 'js') diff --git a/js/tests/phantom.js b/js/tests/phantom.js index f172e7cbc..5173ba9a1 100644 --- a/js/tests/phantom.js +++ b/js/tests/phantom.js @@ -1,65 +1,63 @@ -/* - * Simple phantom.js integration script - * Adapted from Modernizr - */ +// Simple phantom.js integration script +// Adapted from Modernizr function waitFor(testFx, onReady, timeOutMillis) { - var maxtimeOutMillis = timeOutMillis ? timeOutMillis : 3001, //< Default Max Timout is 3s - start = new Date().getTime(), - condition = false, - interval = setInterval(function() { - if ( (new Date().getTime() - start < maxtimeOutMillis) && !condition ) { - // If not time-out yet and condition not yet fulfilled - condition = (typeof(testFx) === "string" ? eval(testFx) : testFx()); //< defensive code - } else { - if(!condition) { - // If condition still not fulfilled (timeout but condition is 'false') - console.log("'waitFor()' timeout"); - phantom.exit(1); - } else { - // Condition fulfilled (timeout and/or condition is 'true') - typeof(onReady) === "string" ? eval(onReady) : onReady(); //< Do what it's supposed to do once the condition is fulfilled - clearInterval(interval); //< Stop this interval - } - } - }, 100); //< repeat check every 250ms -}; + var maxtimeOutMillis = timeOutMillis ? timeOutMillis : 3001 //< Default Max Timout is 3s + , start = new Date().getTime() + , condition = false + , interval = setInterval(function() { + if ((new Date().getTime() - start < maxtimeOutMillis) && !condition) { + // If not time-out yet and condition not yet fulfilled + condition = (typeof(testFx) === "string" ? eval(testFx) : testFx()) //< defensive code + } else { + if(!condition) { + // If condition still not fulfilled (timeout but condition is 'false') + console.log("'waitFor()' timeout") + phantom.exit(1) + } else { + // Condition fulfilled (timeout and/or condition is 'true') + typeof(onReady) === "string" ? eval(onReady) : onReady() //< Do what it's supposed to do once the condition is fulfilled + clearInterval(interval) //< Stop this interval + } + } + }, 100) //< repeat check every 100ms +} if (phantom.args.length === 0 || phantom.args.length > 2) { - console.log('Usage: phantom.js URL'); - phantom.exit(); + console.log('Usage: phantom.js URL') + phantom.exit() } -var page = new WebPage(); +var page = new WebPage() // Route "console.log()" calls from within the Page context to the main Phantom context (i.e. current "this") page.onConsoleMessage = function(msg) { - console.log(msg); + console.log(msg) }; page.open(phantom.args[0], function(status){ - if (status !== "success") { - console.log("Unable to access network"); - phantom.exit(); - } else { - waitFor(function(){ - return page.evaluate(function(){ - var el = document.getElementById('qunit-testresult'); - if (el && el.innerText.match('completed')) { - return true; - } - return false; - }); - }, function(){ - var failedNum = page.evaluate(function(){ - var el = document.getElementById('qunit-testresult'); - try { - return el.getElementsByClassName('failed')[0].innerHTML; - } catch (e) { } - return 10000; - }); - phantom.exit((parseInt(failedNum, 10) > 0) ? 1 : 0); - }); - } -}); \ No newline at end of file + if (status !== "success") { + console.log("Unable to access network") + phantom.exit() + } else { + waitFor(function(){ + return page.evaluate(function(){ + var el = document.getElementById('qunit-testresult') + if (el && el.innerText.match('completed')) { + return true + } + return false + }) + }, function(){ + var failedNum = page.evaluate(function(){ + var el = document.getElementById('qunit-testresult') + try { + return el.getElementsByClassName('failed')[0].innerHTML + } catch (e) { } + return 10000 + }); + phantom.exit((parseInt(failedNum, 10) > 0) ? 1 : 0) + }) + } +}) \ No newline at end of file diff --git a/js/tests/unit/bootstrap-phantom.js b/js/tests/unit/bootstrap-phantom.js index 8bed5f603..a04aeaa87 100644 --- a/js/tests/unit/bootstrap-phantom.js +++ b/js/tests/unit/bootstrap-phantom.js @@ -1,21 +1,21 @@ // Logging setup for phantom integration // adapted from Modernizr -QUnit.begin = function() { - console.log("Starting test suite"); - console.log("================================================\n"); -}; +QUnit.begin = function () { + console.log("Starting test suite") + console.log("================================================\n") +} -QUnit.moduleDone = function(opts) { - if(opts.failed === 0) { - console.log("\u2714 All tests passed in '"+opts.name+"' module"); - } else { - console.log("\u2716 "+ opts.failed +" tests failed in '"+opts.name+"' module"); - } -}; +QUnit.moduleDone = function (opts) { + if (opts.failed === 0) { + console.log("\u2714 All tests passed in '" + opts.name + "' module") + } else { + console.log("\u2716 " + opts.failed + " tests failed in '" + opts.name + "' module") + } +} -QUnit.done = function(opts) { - console.log("\n================================================"); - console.log("Tests completed in "+opts.runtime+" milliseconds"); - console.log(opts.passed + " tests of "+opts.total+" passed, "+opts.failed+" failed."); -}; \ No newline at end of file +QUnit.done = function (opts) { + console.log("\n================================================") + console.log("Tests completed in " + opts.runtime + " milliseconds") + console.log(opts.passed + " tests of " + opts.total + " passed, " + opts.failed + " failed.") +} \ No newline at end of file -- cgit v1.2.3 From c896a182e13b0e5d12a5c2104119d7b873b22162 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 23 Apr 2012 03:18:13 -0700 Subject: increase length of waitfor timeout for phantom --- js/tests/phantom.js | 6 +++--- js/tests/pid.txt | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 js/tests/pid.txt (limited to 'js') diff --git a/js/tests/phantom.js b/js/tests/phantom.js index 5173ba9a1..4105bf529 100644 --- a/js/tests/phantom.js +++ b/js/tests/phantom.js @@ -2,15 +2,15 @@ // Adapted from Modernizr function waitFor(testFx, onReady, timeOutMillis) { - var maxtimeOutMillis = timeOutMillis ? timeOutMillis : 3001 //< Default Max Timout is 3s + var maxtimeOutMillis = timeOutMillis ? timeOutMillis : 5001 //< Default Max Timout is 5s , start = new Date().getTime() , condition = false - , interval = setInterval(function() { + , interval = setInterval(function () { if ((new Date().getTime() - start < maxtimeOutMillis) && !condition) { // If not time-out yet and condition not yet fulfilled condition = (typeof(testFx) === "string" ? eval(testFx) : testFx()) //< defensive code } else { - if(!condition) { + if (!condition) { // If condition still not fulfilled (timeout but condition is 'false') console.log("'waitFor()' timeout") phantom.exit(1) diff --git a/js/tests/pid.txt b/js/tests/pid.txt new file mode 100644 index 000000000..129f3d621 --- /dev/null +++ b/js/tests/pid.txt @@ -0,0 +1 @@ +1520 \ No newline at end of file -- cgit v1.2.3 From c408d8961b96f12c40aaf1d7647578cd3535bd64 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 23 Apr 2012 03:44:32 -0700 Subject: rewrite server.js, fix travis --- js/tests/pid.txt | 1 - js/tests/server.js | 16 ++++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 js/tests/pid.txt (limited to 'js') diff --git a/js/tests/pid.txt b/js/tests/pid.txt deleted file mode 100644 index 129f3d621..000000000 --- a/js/tests/pid.txt +++ /dev/null @@ -1 +0,0 @@ -1520 \ No newline at end of file diff --git a/js/tests/server.js b/js/tests/server.js index 27d1bf24b..7c8445feb 100644 --- a/js/tests/server.js +++ b/js/tests/server.js @@ -4,15 +4,11 @@ */ var connect = require('connect') - , args = process.argv.slice(2) - , fs = require('fs') - , folder = '/../../' - , port = '3000' + , http = require('http') + , fs = require('fs') + , app = connect() + .use(connect.static(__dirname + '/../../')); -var server = connect.createServer( - connect.static(__dirname + folder) -).listen(port) +http.createServer(app).listen(3000); -fs.writeFileSync(__dirname + '/pid.txt', process.pid, 'utf-8') - -console.log("Server started on port %s in %s", port, folder) \ No newline at end of file +fs.writeFileSync(__dirname + '/pid.txt', process.pid, 'utf-8') \ No newline at end of file -- cgit v1.2.3 From 839ef3a030b355d0f0c35d6c9e42ecba8b072036 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 24 Apr 2012 02:19:02 -0700 Subject: 2.0.2 -> 2.0.3 --- 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 | 2 +- js/bootstrap-typeahead.js | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) (limited to 'js') diff --git a/js/bootstrap-alert.js b/js/bootstrap-alert.js index 56174955b..fa0806ea1 100644 --- a/js/bootstrap-alert.js +++ b/js/bootstrap-alert.js @@ -1,5 +1,5 @@ /* ========================================================== - * bootstrap-alert.js v2.0.2 + * bootstrap-alert.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#alerts * ========================================================== * Copyright 2012 Twitter, Inc. diff --git a/js/bootstrap-button.js b/js/bootstrap-button.js index 49e88e49a..a9e6ba7b1 100644 --- a/js/bootstrap-button.js +++ b/js/bootstrap-button.js @@ -1,5 +1,5 @@ /* ============================================================ - * bootstrap-button.js v2.0.2 + * bootstrap-button.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#buttons * ============================================================ * Copyright 2012 Twitter, Inc. diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index 90f43a3eb..96e5a8191 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -1,5 +1,5 @@ /* ========================================================== - * bootstrap-carousel.js v2.0.2 + * bootstrap-carousel.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#carousel * ========================================================== * Copyright 2012 Twitter, Inc. diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 41e097df3..4cd412c73 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -1,5 +1,5 @@ /* ============================================================= - * bootstrap-collapse.js v2.0.2 + * bootstrap-collapse.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#collapse * ============================================================= * Copyright 2012 Twitter, Inc. diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js index d856ba6ec..ec0588dc1 100644 --- a/js/bootstrap-dropdown.js +++ b/js/bootstrap-dropdown.js @@ -1,5 +1,5 @@ /* ============================================================ - * bootstrap-dropdown.js v2.0.2 + * bootstrap-dropdown.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#dropdowns * ============================================================ * Copyright 2012 Twitter, Inc. diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index 959433f2a..c831de6b6 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -1,5 +1,5 @@ /* ========================================================= - * bootstrap-modal.js v2.0.2 + * bootstrap-modal.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#modals * ========================================================= * Copyright 2012 Twitter, Inc. diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index 51820979a..d5ecfa920 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -1,5 +1,5 @@ /* =========================================================== - * bootstrap-popover.js v2.0.2 + * bootstrap-popover.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#popovers * =========================================================== * Copyright 2012 Twitter, Inc. diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js index 5c19ae382..f6a24b003 100644 --- a/js/bootstrap-scrollspy.js +++ b/js/bootstrap-scrollspy.js @@ -1,5 +1,5 @@ /* ============================================================= - * bootstrap-scrollspy.js v2.0.2 + * bootstrap-scrollspy.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#scrollspy * ============================================================= * Copyright 2012 Twitter, Inc. diff --git a/js/bootstrap-tab.js b/js/bootstrap-tab.js index 6255d53ef..88641de86 100644 --- a/js/bootstrap-tab.js +++ b/js/bootstrap-tab.js @@ -1,5 +1,5 @@ /* ======================================================== - * bootstrap-tab.js v2.0.2 + * bootstrap-tab.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#tabs * ======================================================== * Copyright 2012 Twitter, Inc. diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js index af2e58968..577ead48b 100644 --- a/js/bootstrap-tooltip.js +++ b/js/bootstrap-tooltip.js @@ -1,5 +1,5 @@ /* =========================================================== - * bootstrap-tooltip.js v2.0.2 + * bootstrap-tooltip.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#tooltips * Inspired by the original jQuery.tipsy by Jason Frame * =========================================================== diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js index d34caa1b9..7e29b2fd0 100644 --- a/js/bootstrap-transition.js +++ b/js/bootstrap-transition.js @@ -1,5 +1,5 @@ /* =================================================== - * bootstrap-transition.js v2.0.2 + * bootstrap-transition.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#transitions * =================================================== * Copyright 2012 Twitter, Inc. diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js index 429ea989b..ada0526f9 100644 --- a/js/bootstrap-typeahead.js +++ b/js/bootstrap-typeahead.js @@ -1,5 +1,5 @@ /* ============================================================= - * bootstrap-typeahead.js v2.0.2 + * bootstrap-typeahead.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#typeahead * ============================================================= * Copyright 2012 Twitter, Inc. -- cgit v1.2.3