|
|
@ -202,7 +202,7 @@ |
|
|
|
selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
|
|
|
|
selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
$parent = selector && $(selector) |
|
|
|
$parent = selector && $.find(selector) |
|
|
|
|
|
|
|
|
|
|
|
if (!$parent || !$parent.length) $parent = $this.parent() |
|
|
|
if (!$parent || !$parent.length) $parent = $this.parent() |
|
|
|
|
|
|
|
|
|
|
@ -480,7 +480,7 @@ |
|
|
|
$(document).on('click.modal.data-api', '[data-toggle="modal"]', function(e) { |
|
|
|
$(document).on('click.modal.data-api', '[data-toggle="modal"]', function(e) { |
|
|
|
var $this = $(this) |
|
|
|
var $this = $(this) |
|
|
|
, href = $this.attr('href') |
|
|
|
, href = $this.attr('href') |
|
|
|
, $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
|
|
|
|
, $target = $.find($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()) |
|
|
|
, option = $target.data('modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data()) |
|
|
|
|
|
|
|
|
|
|
|
e.preventDefault() |
|
|
|
e.preventDefault() |
|
|
@ -633,7 +633,11 @@ |
|
|
|
.detach() |
|
|
|
.detach() |
|
|
|
.css({ top: 0, left: 0, display: 'block' }) |
|
|
|
.css({ top: 0, left: 0, display: 'block' }) |
|
|
|
|
|
|
|
|
|
|
|
this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element) |
|
|
|
if (this.options.container) { |
|
|
|
|
|
|
|
$tip.appendTo($.find(this.options.container)); |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
$tip.insertAfter(this.$element) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
pos = this.getPosition() |
|
|
|
pos = this.getPosition() |
|
|
|
|
|
|
|
|
|
|
@ -745,7 +749,8 @@ |
|
|
|
var $tip = this.tip() |
|
|
|
var $tip = this.tip() |
|
|
|
, title = this.getTitle() |
|
|
|
, title = this.getTitle() |
|
|
|
|
|
|
|
|
|
|
|
$tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title) |
|
|
|
//$tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
|
|
|
|
|
|
|
|
$tip.find('.tooltip-inner').text(title) |
|
|
|
$tip.removeClass('fade in top bottom left right') |
|
|
|
$tip.removeClass('fade in top bottom left right') |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -950,7 +955,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
if (e.isDefaultPrevented()) return |
|
|
|
if (e.isDefaultPrevented()) return |
|
|
|
|
|
|
|
|
|
|
|
$target = $(selector) |
|
|
|
$target = $.find(selector) |
|
|
|
|
|
|
|
|
|
|
|
this.activate($this.parent('li'), $ul) |
|
|
|
this.activate($this.parent('li'), $ul) |
|
|
|
this.activate($target, $target.parent(), function() { |
|
|
|
this.activate($target, $target.parent(), function() { |
|
|
|