From 2aec6dae597b69502d09aec983598e5f955ca558 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Jun 2013 16:01:59 -0700 Subject: Fixes #7730: Better hiding of empty titles in popovers If the popover's title contains no text, hide it via JS. Previously was done via CSS's `:empty` property, but that doesn't work in IE8, so JS it is. /cc @fat becaue I probably did this wrong <3 --- docs/assets/js/bootstrap.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docs/assets/js/bootstrap.js') diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js index 744b27676..2cbf1957c 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -1420,6 +1420,8 @@ $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content) $tip.removeClass('fade top bottom left right in') + + $tip.find('.popover-title:empty').hide() } Popover.prototype.hasContent = function () { -- cgit v1.2.3 From 6a2858f7bf9a1b6683f883870e898c9f0656b64f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 27 Jun 2013 19:36:35 -0700 Subject: make on js i guess? /cc @fat --- docs/assets/js/bootstrap.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/js/bootstrap.js') diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js index 2cbf1957c..c73b8e187 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -535,7 +535,7 @@ [dimension](size || 'auto') [0].offsetWidth - this.$element[size !== null ? 'addClass' : 'removeClass']('collapse') + this.$element[size != null ? 'addClass' : 'removeClass']('collapse') return this } -- cgit v1.2.3 From 1a09eada35259de198ffad56a460c6ffafe890a4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 28 Jun 2013 00:08:19 -0700 Subject: Run make on JS --- docs/assets/js/bootstrap.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docs/assets/js/bootstrap.js') diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js index c73b8e187..03888ac5f 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -603,7 +603,10 @@ || e.preventDefault() || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 var option = $(target).data('collapse') ? 'toggle' : $this.data() + var parent = $this.attr('data-parent') + var $parent = parent && $(parent) + if ($parent) $parent.find('[data-toggle=collapse][data-parent=' + parent + ']').not($this).addClass('collapsed') $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed') $(target).collapse(option) }) -- cgit v1.2.3 From f97dd5af493f532046a3782b12dea5354c947597 Mon Sep 17 00:00:00 2001 From: fat Date: Wed, 17 Jul 2013 19:33:21 -0700 Subject: rebuild doe --- docs/assets/js/bootstrap.js | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'docs/assets/js/bootstrap.js') diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js index 03888ac5f..b4845bb80 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -502,6 +502,10 @@ Collapse.prototype.show = function () { if (this.transitioning || this.$element.hasClass('in')) return + var startEvent = $.Event('show.bs.collapse') + this.$element.trigger(startEvent) + if (startEvent.isDefaultPrevented()) return + var dimension = this.dimension() var scroll = $.camelCase(['scroll', dimension].join('-')) var actives = this.$parent && this.$parent.find('> .accordion-group > .in') @@ -514,16 +518,21 @@ } this.$element[dimension](0) - this.transition('addClass', $.Event('show.bs.collapse'), 'shown.bs.collapse') + this.transition('addClass', 'shown.bs.collapse') if ($.support.transition) this.$element[dimension](this.$element[0][scroll]) } Collapse.prototype.hide = function () { if (this.transitioning || !this.$element.hasClass('in')) return + + var startEvent = $.Event('hide.bs.collapse') + this.$element.trigger(startEvent) + if (startEvent.isDefaultPrevented()) return + var dimension = this.dimension() this.reset(this.$element[dimension]()) - this.transition('removeClass', $.Event('hide.bs.collapse'), 'hidden') + this.transition('removeClass', 'shown.bs.hidden') this.$element[dimension](0) } @@ -540,18 +549,14 @@ return this } - Collapse.prototype.transition = function (method, startEvent, completeEvent) { + Collapse.prototype.transition = function (method, completeEvent) { var that = this var complete = function () { - if (startEvent.type == 'show') that.reset() + if (completeEvent == 'shown.bs.collapse') that.reset() that.transitioning = 0 that.$element.trigger(completeEvent) } - this.$element.trigger(startEvent) - - if (startEvent.isDefaultPrevented()) return - this.transitioning = 1 this.$element[method]('in') -- cgit v1.2.3