From 2ee9b2717bfd532e93eb6d4037ae7ca7a5436957 Mon Sep 17 00:00:00 2001 From: Jon Stevens Date: Mon, 16 Jul 2012 16:01:11 -0700 Subject: namespace the events for popover/tooltip so that they can be cleanly removed. issue #3880 --- js/bootstrap-popover.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'js/bootstrap-popover.js') diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index fe22ecb47..845108b9b 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -72,7 +72,7 @@ } , destroy: function () { - this.$element.off().removeData('popover') + this.$element.off(this.options.ns).removeData('popover') } }) @@ -97,6 +97,7 @@ placement: 'right' , content: '' , template: '

' + , ns: '.popover' }) }(window.jQuery); \ No newline at end of file -- cgit v1.2.3 From 117f65d43108d5d7ff1c5011f0b8b61f7ef3b9dd Mon Sep 17 00:00:00 2001 From: Jon Stevens Date: Fri, 20 Jul 2012 09:47:12 -0700 Subject: on destroy, also hide. issue #3880, pull #4104 --- js/bootstrap-popover.js | 1 + 1 file changed, 1 insertion(+) (limited to 'js/bootstrap-popover.js') diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index 845108b9b..57420bb5d 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -72,6 +72,7 @@ } , destroy: function () { + this.hide() this.$element.off(this.options.ns).removeData('popover') } -- cgit v1.2.3 From 393f4a7b4244233a6ad24a48b68869329f4756b8 Mon Sep 17 00:00:00 2001 From: Jon Stevens Date: Sun, 22 Jul 2012 14:19:11 -0700 Subject: simplify things to one line. pull #4104 --- js/bootstrap-popover.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'js/bootstrap-popover.js') diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index 57420bb5d..2a2b298dc 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -72,8 +72,7 @@ } , destroy: function () { - this.hide() - this.$element.off(this.options.ns).removeData('popover') + this.hide().$element.off(this.options.ns).removeData('popover') } }) -- cgit v1.2.3 From d76c8991424b91050636fb94e740daa123306e95 Mon Sep 17 00:00:00 2001 From: Jon Stevens Date: Sun, 22 Jul 2012 14:36:23 -0700 Subject: remove the ns option --- js/bootstrap-popover.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'js/bootstrap-popover.js') 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: '

' - , ns: '.popover' }) }(window.jQuery); \ No newline at end of file -- cgit v1.2.3