diff options
| author | Jon Stevens <[email protected]> | 2012-07-22 14:36:23 -0700 |
|---|---|---|
| committer | Jon Stevens <[email protected]> | 2012-07-22 14:36:23 -0700 |
| commit | d76c8991424b91050636fb94e740daa123306e95 (patch) | |
| tree | 01d94af383d20e0633c27024ef2dee7d93e1eed7 | |
| parent | 393f4a7b4244233a6ad24a48b68869329f4756b8 (diff) | |
| download | bootstrap-d76c8991424b91050636fb94e740daa123306e95.tar.xz bootstrap-d76c8991424b91050636fb94e740daa123306e95.zip | |
remove the ns option
| -rw-r--r-- | docs/templates/pages/javascript.mustache | 12 | ||||
| -rw-r--r-- | js/bootstrap-popover.js | 3 | ||||
| -rw-r--r-- | js/bootstrap-tooltip.js | 7 |
3 files changed, 4 insertions, 18 deletions
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 4ec8a5f51..13480719e 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -754,12 +754,6 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <p>{{_i}}Object structure is: <code>delay: { show: 500, hide: 100 }</code>{{/i}}</p> </td> </tr> - <tr> - <td>{{_i}}ns{{/i}}</td> - <td>{{_i}}string{{/i}}</td> - <td>'.tooltip'</td> - <td>{{_i}}jQuery event namespace{{/i}}</td> - </tr> </tbody> </table> <div class="alert alert-info"> @@ -918,12 +912,6 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <p>{{_i}}Object structure is: <code>delay: { show: 500, hide: 100 }</code>{{/i}}</p> </td> </tr> - <tr> - <td>{{_i}}ns{{/i}}</td> - <td>{{_i}}string{{/i}}</td> - <td>'.popover'</td> - <td>{{_i}}jQuery event namespace{{/i}}</td> - </tr> </tbody> </table> <div class="alert alert-info"> diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index 2a2b298dc..2e6d9c32a 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -72,7 +72,7 @@ } , destroy: function () { - this.hide().$element.off(this.options.ns).removeData('popover') + this.hide().$element.off('.' + this.type).removeData(this.type) } }) @@ -97,7 +97,6 @@ placement: 'right' , content: '' , template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>' - , ns: '.popover' }) }(window.jQuery);
\ No newline at end of file diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js index fa1c9a6c5..f9447410e 100644 --- a/js/bootstrap-tooltip.js +++ b/js/bootstrap-tooltip.js @@ -47,8 +47,8 @@ if (this.options.trigger != 'manual') { eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus' eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur' - this.$element.on(eventIn + this.options.ns, this.options.selector, $.proxy(this.enter, this)) - this.$element.on(eventOut + this.options.ns, this.options.selector, $.proxy(this.leave, this)) + this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this)) + this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this)) } this.options.selector ? @@ -238,7 +238,7 @@ } , destroy: function () { - this.hide().$element.off(this.options.ns).removeData('tooltip') + this.hide().$element.off('.' + this.type).removeData(this.type) } } @@ -268,7 +268,6 @@ , title: '' , delay: 0 , html: true - , ns: '.tooltip' } }(window.jQuery); |