Commit 9b9e2f5d authored by Heinrich Fenkart's avatar Heinrich Fenkart

grunt and missing new line

parent fb1ca10b
...@@ -567,6 +567,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re ...@@ -567,6 +567,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
this.$element this.$element
.removeClass('collapse') .removeClass('collapse')
.addClass('collapsing')[dimension](0) .addClass('collapsing')[dimension](0)
.attr('aria-expanded', true)
this.transitioning = 1 this.transitioning = 1
...@@ -602,6 +603,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re ...@@ -602,6 +603,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
this.$element this.$element
.addClass('collapsing') .addClass('collapsing')
.removeClass('collapse in') .removeClass('collapse in')
.attr('aria-expanded', false)
this.transitioning = 1 this.transitioning = 1
...@@ -672,8 +674,9 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re ...@@ -672,8 +674,9 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
var $parent = parent && $(parent) var $parent = parent && $(parent)
if (!data || !data.transitioning) { 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').attr('aria-expanded', false)
$this.toggleClass('collapsed', $target.hasClass('in')) var isCollapsed = $target.hasClass('in')
$this.toggleClass('collapsed', isCollapsed).attr('aria-expanded', !isCollapsed)
} }
Plugin.call($target, option) Plugin.call($target, option)
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -567,6 +567,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re ...@@ -567,6 +567,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
this.$element this.$element
.removeClass('collapse') .removeClass('collapse')
.addClass('collapsing')[dimension](0) .addClass('collapsing')[dimension](0)
.attr('aria-expanded', true)
this.transitioning = 1 this.transitioning = 1
...@@ -602,6 +603,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re ...@@ -602,6 +603,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
this.$element this.$element
.addClass('collapsing') .addClass('collapsing')
.removeClass('collapse in') .removeClass('collapse in')
.attr('aria-expanded', false)
this.transitioning = 1 this.transitioning = 1
...@@ -672,8 +674,9 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re ...@@ -672,8 +674,9 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
var $parent = parent && $(parent) var $parent = parent && $(parent)
if (!data || !data.transitioning) { 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').attr('aria-expanded', false)
$this.toggleClass('collapsed', $target.hasClass('in')) var isCollapsed = $target.hasClass('in')
$this.toggleClass('collapsed', isCollapsed).attr('aria-expanded', !isCollapsed)
} }
Plugin.call($target, option) Plugin.call($target, option)
......
This diff is collapsed.
...@@ -263,4 +263,4 @@ $(function () { ...@@ -263,4 +263,4 @@ $(function () {
$target3.click() $target3.click()
}) })
}) })
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment