From 76cadd1d2a493d4cbcfe8acd984bd4f908b25abf Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 8 Jan 2012 14:36:41 -0800 Subject: [PATCH 1/6] only append modal to dom if not already present --- js/bootstrap-modal.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index 98a62865b3..670d55c4ec 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() && that.$element.appendTo(document.body) //don't move modals dom position + that.$element - .appendTo(document.body) .show() if (transition) { From aa0c4acd80562645ae85ef9a76f6b45e778d7acd Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 8 Jan 2012 14:38:21 -0800 Subject: [PATCH 2/6] fix modal insertion boolean --- js/bootstrap-modal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index 670d55c4ec..df4f3c7643 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -51,7 +51,7 @@ backdrop.call(this, function () { var transition = $.support.transition && that.$element.hasClass('fade') - !that.$element.parent() && that.$element.appendTo(document.body) //don't move modals dom position + !that.$element.parent().length && that.$element.appendTo(document.body) //don't move modals dom position that.$element .show() From 6e8a3bba32312cb13cf70acca0575ff14651437e Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 8 Jan 2012 14:54:36 -0800 Subject: [PATCH 3/6] add note about firefox persisting disabled state on buttons --- docs/javascript.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/javascript.html b/docs/javascript.html index f9877dc028..76b5edb87e 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -811,6 +811,9 @@ $('#my-alert').bind('closed', function () {

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 data-loading-text. 

<button class="btn" data-loading-text="loading stuff..." >...</button>
+

+ Notice Firefox persists the disabled state across page loads. A workaround for this is to use: autocomplete="off". More info can be found here. +

$().button('reset')

Resets button state - swaps text to original text.

$().button(string)

From 91d393fd4705faff072a33f9697e0bf194fe40db Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 8 Jan 2012 15:01:23 -0800 Subject: [PATCH 4/6] change prepend to append --- js/bootstrap-twipsy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/bootstrap-twipsy.js b/js/bootstrap-twipsy.js index 1ce4ad85b6..756775f43e 100644 --- a/js/bootstrap-twipsy.js +++ b/js/bootstrap-twipsy.js @@ -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) From dbe5e666af51a4d85923c1a7754da1c929dfc249 Mon Sep 17 00:00:00 2001 From: Maik Schreiber Date: Mon, 9 Jan 2012 00:02:13 +0100 Subject: [PATCH 5/6] fix typo --- docs/components.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/components.html b/docs/components.html index 0c70ef1680..104bedf54f 100644 --- a/docs/components.html +++ b/docs/components.html @@ -512,7 +512,7 @@ </div> </div> -

To make the navbar fixed, swamp the .navbar-static class for .navbar-fixed. In your CSS, you will also need to account for the overlap it causes by adding padding-top: 40px; to your <body>.

+

To make the navbar fixed, swap the .navbar-static class for .navbar-fixed. In your CSS, you will also need to account for the overlap it causes by adding padding-top: 40px; to your <body>.

 <div class="navbar navbar-fixed">
   ...

From 7aca72322effb717804af8348d3b58cfa2cbe000 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Sun, 8 Jan 2012 15:12:34 -0800
Subject: [PATCH 6/6] move hover state out of timeout duh

---
 docs/javascript.html   | 2 +-
 js/bootstrap-twipsy.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/javascript.html b/docs/javascript.html
index 76b5edb87e..f7980d86b5 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -517,7 +517,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
       
     
 
-    
 
     

diff --git a/js/bootstrap-twipsy.js b/js/bootstrap-twipsy.js
index 756775f43e..b7b802926d 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()
           }