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 | |
| 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
| -rw-r--r-- | docs/components.html | 2 | ||||
| -rw-r--r-- | docs/javascript.html | 5 | ||||
| -rw-r--r-- | js/bootstrap-modal.js | 3 | ||||
| -rw-r--r-- | js/bootstrap-twipsy.js | 4 |
4 files changed, 9 insertions, 5 deletions
diff --git a/docs/components.html b/docs/components.html index 0c70ef168..104bedf54 100644 --- a/docs/components.html +++ b/docs/components.html @@ -512,7 +512,7 @@ </div> </div> </pre> - <p>To make the navbar fixed, swamp the <code>.navbar-static</code> class for <code>.navbar-fixed</code>. In your CSS, you will also need to account for the overlap it causes by adding <code>padding-top: 40px;</code> to your <code><body></code>.</p> + <p>To make the navbar fixed, swap the <code>.navbar-static</code> class for <code>.navbar-fixed</code>. In your CSS, you will also need to account for the overlap it causes by adding <code>padding-top: 40px;</code> to your <code><body></code>.</p> <pre class="prettyprint linenums"> <div class="navbar navbar-fixed"> ... diff --git a/docs/javascript.html b/docs/javascript.html index a46813ad8..63a51dc43 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -505,7 +505,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { </div> </section> - <!-- Tips + <!-- Twipsy ================================================== --> <section id="twipsy"> @@ -799,6 +799,9 @@ $('#my-alert').bind('closed', function () { <p>Sets button state to loading - disables button and swaps text to loading text. Loading text should be defined on the button element using the data attribute <code>data-loading-text</code>. </p> <pre class="prettyprint linenums"><button class="btn" data-loading-text="loading stuff..." >...</button></pre> + <p> + <span class="label notice">Notice</span> Firefox persists the disabled state across page loads. A workaround for this is to use: <code>autocomplete="off"</code>. More info can be found <a href="https://github.com/twitter/bootstrap/issues/793">here</a>. + </p> <h4>$().button('reset')</h4> <p>Resets button state - swaps text to original text.</p> <h4>$().button(string)</h4> 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) |