rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

grunt

Browse Source
This commit is contained in:
Heinrich Fenkart 2014-11-17 18:57:02 +01:00
parent 6503cb0822
commit c2abfc0a44
8 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/css/bootstrap.css.map vendored
View File

File diff suppressed because one or more lines are too long

13
dist/js/bootstrap.js vendored
View File

@ -359,8 +359,11 @@ if (typeof jQuery === 'undefined') {
} }
Carousel.prototype.getItemForDirection = function (direction, active) { Carousel.prototype.getItemForDirection = function (direction, active) {
var delta = direction == 'prev' ? -1 : 1
var activeIndex = this.getItemIndex(active) var activeIndex = this.getItemIndex(active)
var willWrap = (direction == 'prev' && activeIndex === 0)
|| (direction == 'next' && activeIndex == (this.$items.length - 1))
if (willWrap && !this.options.wrap) return active
var delta = direction == 'prev' ? -1 : 1
var itemIndex = (activeIndex + delta) % this.$items.length var itemIndex = (activeIndex + delta) % this.$items.length
return this.$items.eq(itemIndex) return this.$items.eq(itemIndex)
} }
@ -405,14 +408,8 @@ if (typeof jQuery === 'undefined') {
var $next = next || this.getItemForDirection(type, $active) var $next = next || this.getItemForDirection(type, $active)
var isCycling = this.interval var isCycling = this.interval
var direction = type == 'next' ? 'left' : 'right' var direction = type == 'next' ? 'left' : 'right'
var fallback = type == 'next' ? 'first' : 'last'
var that = this var that = this
if (!$next.length) {
if (!this.options.wrap) return
$next = this.$element.find('.item')[fallback]()
}
if ($next.hasClass('active')) return (this.sliding = false) if ($next.hasClass('active')) return (this.sliding = false)
var relatedTarget = $next[0] var relatedTarget = $next[0]
@ -576,7 +573,7 @@ if (typeof jQuery === 'undefined') {
if (this.transitioning || this.$element.hasClass('in')) return if (this.transitioning || this.$element.hasClass('in')) return
var activesData var activesData
var actives = this.$parent && this.$parent.find('> .panel').children('.in, .collapsing') var actives = this.$parent && this.$parent.children('.panel').children('.in, .collapsing')
if (actives && actives.length) { if (actives && actives.length) {
activesData = actives.data('bs.collapse') activesData = actives.data('bs.collapse')

2
dist/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
docs/assets/js/raw-files.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
docs/dist/css/bootstrap.css.map vendored
View File

File diff suppressed because one or more lines are too long

13
docs/dist/js/bootstrap.js vendored
View File

@ -359,8 +359,11 @@ if (typeof jQuery === 'undefined') {
} }
Carousel.prototype.getItemForDirection = function (direction, active) { Carousel.prototype.getItemForDirection = function (direction, active) {
var delta = direction == 'prev' ? -1 : 1
var activeIndex = this.getItemIndex(active) var activeIndex = this.getItemIndex(active)
var willWrap = (direction == 'prev' && activeIndex === 0)
|| (direction == 'next' && activeIndex == (this.$items.length - 1))
if (willWrap && !this.options.wrap) return active
var delta = direction == 'prev' ? -1 : 1
var itemIndex = (activeIndex + delta) % this.$items.length var itemIndex = (activeIndex + delta) % this.$items.length
return this.$items.eq(itemIndex) return this.$items.eq(itemIndex)
} }
@ -405,14 +408,8 @@ if (typeof jQuery === 'undefined') {
var $next = next || this.getItemForDirection(type, $active) var $next = next || this.getItemForDirection(type, $active)
var isCycling = this.interval var isCycling = this.interval
var direction = type == 'next' ? 'left' : 'right' var direction = type == 'next' ? 'left' : 'right'
var fallback = type == 'next' ? 'first' : 'last'
var that = this var that = this
if (!$next.length) {
if (!this.options.wrap) return
$next = this.$element.find('.item')[fallback]()
}
if ($next.hasClass('active')) return (this.sliding = false) if ($next.hasClass('active')) return (this.sliding = false)
var relatedTarget = $next[0] var relatedTarget = $next[0]
@ -576,7 +573,7 @@ if (typeof jQuery === 'undefined') {
if (this.transitioning || this.$element.hasClass('in')) return if (this.transitioning || this.$element.hasClass('in')) return
var activesData var activesData
var actives = this.$parent && this.$parent.find('> .panel').children('.in, .collapsing') var actives = this.$parent && this.$parent.children('.panel').children('.in, .collapsing')
if (actives && actives.length) { if (actives && actives.length) {
activesData = actives.data('bs.collapse') activesData = actives.data('bs.collapse')

2
docs/dist/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
less/carousel.less
View File

@ -30,7 +30,7 @@
.transition-transform(~'0.6s ease-in-out'); .transition-transform(~'0.6s ease-in-out');
.backface-visibility(~'hidden'); .backface-visibility(~'hidden');
.perspective(1000); .perspective(1000);
&.next, &.next,
&.active.right { &.active.right {
.translate3d(100%, 0, 0); .translate3d(100%, 0, 0);