diff options
| author | Mark Otto <[email protected]> | 2012-01-08 15:33:55 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-08 15:33:55 -0800 |
| commit | e654ec13369761e252aa279d5e0a1002ba23cfb7 (patch) | |
| tree | efeac31cadc20c9192ade650bf6f945069b2d23a /js | |
| parent | 4b79443bba6ad83d9da62e00765ef45121fb39ff (diff) | |
| parent | a24cdb3e408f23de64e33642efbda7e8f7d3f2b8 (diff) | |
| download | bootstrap-e654ec13369761e252aa279d5e0a1002ba23cfb7.tar.xz bootstrap-e654ec13369761e252aa279d5e0a1002ba23cfb7.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Diffstat (limited to 'js')
| -rw-r--r-- | js/bootstrap-modal.js | 3 | ||||
| -rw-r--r-- | js/bootstrap-twipsy.js | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index 98a62865b..df4f3c764 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -51,8 +51,9 @@ backdrop.call(this, function () { var transition = $.support.transition && that.$element.hasClass('fade') + !that.$element.parent().length && that.$element.appendTo(document.body) //don't move modals dom position + that.$element - .appendTo(document.body) .show() if (transition) { diff --git a/js/bootstrap-twipsy.js b/js/bootstrap-twipsy.js index 1ce4ad85b..b7b802926 100644 --- a/js/bootstrap-twipsy.js +++ b/js/bootstrap-twipsy.js @@ -88,8 +88,8 @@ if (!self.options.delay || !self.options.delay.hide) { self.hide() } else { + self.hoverState = 'out' setTimeout(function() { - self.hoverState = 'out' if (self.hoverState == 'out') { self.hide() } @@ -123,7 +123,7 @@ $tip .remove() .css({ top: 0, left: 0, display: 'block' }) - .prependTo(inside ? this.$element : document.body) + .appendTo(inside ? this.$element : document.body) pos = this.getPosition(inside) |