From 7a3c61ee33b8a07de20b2d30ed2bcd5fd7649fd6 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 31 Jul 2013 22:57:00 -0700 Subject: fixes #8892 --- js/collapse.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/collapse.js') diff --git a/js/collapse.js b/js/collapse.js index 34ac3c7fa..ab575515d 100644 --- a/js/collapse.js +++ b/js/collapse.js @@ -48,7 +48,7 @@ this.$element.trigger(startEvent) if (startEvent.isDefaultPrevented()) return - var actives = this.$parent && this.$parent.find('> .accordion-group > .in') + var actives = this.$parent && this.$parent.find('> .accordion-group > .in') if (actives && actives.length) { var hasData = actives.data('bs.collapse') -- cgit v1.2.3 From fb57eda26857f1312e4415926135e675895b13e1 Mon Sep 17 00:00:00 2001 From: Jason Diamond Date: Sun, 4 Aug 2013 23:59:57 -0700 Subject: use quotes to allow dots in data-parent --- js/collapse.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/collapse.js') diff --git a/js/collapse.js b/js/collapse.js index ab575515d..b20022a2e 100644 --- a/js/collapse.js +++ b/js/collapse.js @@ -169,7 +169,7 @@ var $parent = parent && $(parent) if (!data || !data.transitioning) { - if ($parent) $parent.find('[data-toggle=collapse][data-parent=' + parent + ']').not($this).addClass('collapsed') + if ($parent) $parent.find('[data-toggle=collapse][data-parent="' + parent + '"]').not($this).addClass('collapsed') $this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed') } -- cgit v1.2.3 From 237640c70697ffa0605770dee625d9e3c6abf479 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Aug 2013 23:36:25 -0700 Subject: Drop the accordion for the panel * Deletes the accordion.less file * Extends the panel to be collapsible with our JS plugin * Supports panel color variations --- js/collapse.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/collapse.js') diff --git a/js/collapse.js b/js/collapse.js index b20022a2e..92cc0bc76 100644 --- a/js/collapse.js +++ b/js/collapse.js @@ -48,7 +48,7 @@ this.$element.trigger(startEvent) if (startEvent.isDefaultPrevented()) return - var actives = this.$parent && this.$parent.find('> .accordion-group > .in') + var actives = this.$parent && this.$parent.find('> .panel > .in') if (actives && actives.length) { var hasData = actives.data('bs.collapse') -- cgit v1.2.3