diff options
Diffstat (limited to 'js')
| -rw-r--r-- | js/bootstrap-carousel.js | 2 | ||||
| -rw-r--r-- | js/bootstrap-modal.js | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index 1bb8f5a06..f8f3c6451 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -68,7 +68,7 @@ , pause: function (e) { if (!e) this.paused = true - if (this.$element.find('.next, .prev') && $.support.transition.end) { + if (this.$element.find('.next, .prev').length && $.support.transition.end) { this.$element.trigger($.support.transition.end) this.cycle() } diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index fb5da75c3..966339908 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -30,6 +30,7 @@ this.options = options this.$element = $(content) .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this)) + this.options.remote && this.$element.find('.modal-body').load(this.options.remote) } Modal.prototype = { @@ -215,9 +216,10 @@ $(function () { $('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) { - var $this = $(this), href - , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - , option = $target.data('modal') ? 'toggle' : $.extend({}, $target.data(), $this.data()) + var $this = $(this) + , href = $this.attr('href') + , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7 + , option = $target.data('modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data()) e.preventDefault() $target.modal(option) |