mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00
Code Activity

grunt

Browse Source
This commit is contained in:
Heinrich Fenkart
2014-10-23 05:23:29 +02:00
parent 57e4b58782
commit e0cea19cbc
6 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/js/bootstrap.js
Vendored
+14 -6
View File
@@ -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]
}) })
}) })
} }
dist/js/bootstrap.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
docs/assets/js/customize.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/assets/js/raw-files.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/js/bootstrap.js
Vendored
+14 -6
View File
@@ -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]
}) })
}) })
} }
docs/dist/js/bootstrap.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long