Commit e0cea19c authored by Heinrich Fenkart's avatar Heinrich Fenkart

grunt

parent 57e4b587
...@@ -1926,22 +1926,30 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re ...@@ -1926,22 +1926,30 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
if ($this.parent('li').hasClass('active')) return if ($this.parent('li').hasClass('active')) return
var previous = $ul.find('.active:last a')[0] var $previous = $ul.find('.active:last a')
var e = $.Event('show.bs.tab', { var hideEvent = $.Event('hide.bs.tab', {
relatedTarget: previous relatedTarget: $this[0]
})
var showEvent = $.Event('show.bs.tab', {
relatedTarget: $previous[0]
}) })
$this.trigger(e) $previous.trigger(hideEvent)
$this.trigger(showEvent)
if (e.isDefaultPrevented()) return if (showEvent.isDefaultPrevented() || hideEvent.isDefaultPrevented()) return
var $target = $(selector) var $target = $(selector)
this.activate($this.closest('li'), $ul) this.activate($this.closest('li'), $ul)
this.activate($target, $target.parent(), function () { this.activate($target, $target.parent(), function () {
$previous.trigger({
type: 'hidden.bs.tab',
relatedTarget: $this[0]
})
$this.trigger({ $this.trigger({
type: 'shown.bs.tab', type: 'shown.bs.tab',
relatedTarget: previous relatedTarget: $previous[0]
}) })
}) })
} }
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -1926,22 +1926,30 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re ...@@ -1926,22 +1926,30 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
if ($this.parent('li').hasClass('active')) return if ($this.parent('li').hasClass('active')) return
var previous = $ul.find('.active:last a')[0] var $previous = $ul.find('.active:last a')
var e = $.Event('show.bs.tab', { var hideEvent = $.Event('hide.bs.tab', {
relatedTarget: previous relatedTarget: $this[0]
})
var showEvent = $.Event('show.bs.tab', {
relatedTarget: $previous[0]
}) })
$this.trigger(e) $previous.trigger(hideEvent)
$this.trigger(showEvent)
if (e.isDefaultPrevented()) return if (showEvent.isDefaultPrevented() || hideEvent.isDefaultPrevented()) return
var $target = $(selector) var $target = $(selector)
this.activate($this.closest('li'), $ul) this.activate($this.closest('li'), $ul)
this.activate($target, $target.parent(), function () { this.activate($target, $target.parent(), function () {
$previous.trigger({
type: 'hidden.bs.tab',
relatedTarget: $this[0]
})
$this.trigger({ $this.trigger({
type: 'shown.bs.tab', type: 'shown.bs.tab',
relatedTarget: previous relatedTarget: $previous[0]
}) })
}) })
} }
......
This diff is collapsed.
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