diff options
Diffstat (limited to 'js/carousel.js')
| -rw-r--r-- | js/carousel.js | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/js/carousel.js b/js/carousel.js index 3c2e21b6f..9ac7c6a2c 100644 --- a/js/carousel.js +++ b/js/carousel.js @@ -1,20 +1,9 @@ /* ======================================================================== - * Bootstrap: carousel.js v3.0.3 + * Bootstrap: carousel.js v3.1.0 * http://getbootstrap.com/javascript/#carousel * ======================================================================== * Copyright 2013 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -141,7 +130,7 @@ that.sliding = false setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0) }) - .emulateTransitionEnd(600) + .emulateTransitionEnd($active.css('transition-duration').slice(0, -1) * 1000) } else { this.$element.trigger(e) if (e.isDefaultPrevented()) return |