diff options
| author | Mark Otto <markotto@twitter.com> | 2012-02-13 01:27:29 +0400 |
|---|---|---|
| committer | Mark Otto <markotto@twitter.com> | 2012-02-13 01:27:29 +0400 |
| commit | de6f3d4a6f3c2c55394e59e0a25ea85731166cfe (patch) | |
| tree | e3e7dd6836f39a75ec99526a062510357c547a0b /docs | |
| parent | ebe547b6a0c4ab8c546221db0731104c464920b3 (diff) | |
| parent | 5b4a29d84e6290a93db98da34b89776a9740e455 (diff) | |
Merge branch '2.0.1-wip' of github.com:twitter/bootstrap into 2.0.1-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 52743 -> 52750 bytes | |||
| -rw-r--r-- | docs/assets/js/bootstrap-modal.js | 2 | ||||
| -rw-r--r-- | docs/javascript.html | 4 | ||||
| -rw-r--r-- | docs/templates/pages/javascript.mustache | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 28407b9a3d..89446db2c2 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/js/bootstrap-modal.js b/docs/assets/js/bootstrap-modal.js index 180f0b64d9..ffbed0d2ef 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() diff --git a/docs/javascript.html b/docs/javascript.html index 855cd82bc4..f5563ac537 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 012e195f59..553913d21d 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> |