From ed07a4d0ce0e769ef6efbd8d465670b26a0a5e37 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 12 Feb 2012 11:06:50 -0800
Subject: add note about popover placement

---
 docs/assets/bootstrap.zip                | Bin 52560 -> 52560 bytes
 docs/javascript.html                     |   4 ++--
 docs/templates/pages/javascript.mustache |   4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'docs')

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index ed47cebd5..c850abc89 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/javascript.html b/docs/javascript.html
index 06ce514a1..861c18c1a 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -733,7 +733,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
              </tr>
              <tr>
                <td>placement</td>
-               <td>string</td>
+               <td>string|function</td>
                <td>'top'</td>
                <td>how to position the tooltip - top | bottom | left | right</td>
              </tr>
@@ -836,7 +836,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
              </tr>
              <tr>
                <td>placement</td>
-               <td>string</td>
+               <td>string|function</td>
                <td>'right'</td>
                <td>how to position the popover - top | bottom | left | right</td>
              </tr>
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 705b35b47..88c90ce11 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -657,7 +657,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
              </tr>
              <tr>
                <td>{{_i}}placement{{/i}}</td>
-               <td>{{_i}}string{{/i}}</td>
+               <td>{{_i}}string|function{{/i}}</td>
                <td>'top'</td>
                <td>{{_i}}how to position the tooltip{{/i}} - top | bottom | left | right</td>
              </tr>
@@ -760,7 +760,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
              </tr>
              <tr>
                <td>{{_i}}placement{{/i}}</td>
-               <td>{{_i}}string{{/i}}</td>
+               <td>{{_i}}string|function{{/i}}</td>
                <td>'right'</td>
                <td>{{_i}}how to position the popover{{/i}} - top | bottom | left | right</td>
              </tr>
-- 
cgit v1.2.3


From 5b4a29d84e6290a93db98da34b89776a9740e455 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 12 Feb 2012 11:15:12 -0800
Subject: honor data attributes set on modal as well

---
 docs/assets/bootstrap.zip         | Bin 52705 -> 52712 bytes
 docs/assets/js/bootstrap-modal.js |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs')

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 18f938cf9..073df93f0 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/js/bootstrap-modal.js b/docs/assets/js/bootstrap-modal.js
index 180f0b64d..ffbed0d2e 100644
--- a/docs/assets/js/bootstrap-modal.js
+++ b/docs/assets/js/bootstrap-modal.js
@@ -177,7 +177,7 @@
     return this.each(function () {
       var $this = $(this)
         , data = $this.data('modal')
-        , options = $.extend({}, $.fn.modal.defaults, typeof option == 'object' && option)
+        , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option)
       if (!data) $this.data('modal', (data = new Modal(this, options)))
       if (typeof option == 'string') data[option]()
       else if (options.show) data.show()
-- 
cgit v1.2.3