From 2ee9b2717bfd532e93eb6d4037ae7ca7a5436957 Mon Sep 17 00:00:00 2001
From: Jon Stevens <latchkey@gmail.com>
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-tooltip.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'js/bootstrap-tooltip.js')

diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js
index f280e3696..02f84d470 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.selector, $.proxy(this.enter, this))
-        this.$element.on(eventOut, this.options.selector, $.proxy(this.leave, this))
+        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.options.selector ?
@@ -236,7 +236,7 @@
     }
 
   , destroy: function () {
-      this.$element.off().removeData('tooltip')
+      this.$element.off(this.options.ns).removeData('tooltip')
     }
 
   }
@@ -266,6 +266,7 @@
   , title: ''
   , delay: 0
   , html: true
+  , ns: '.tooltip'
   }
 
 }(window.jQuery);
-- 
cgit v1.2.3


From 117f65d43108d5d7ff1c5011f0b8b61f7ef3b9dd Mon Sep 17 00:00:00 2001
From: Jon Stevens <latchkey@gmail.com>
Date: Fri, 20 Jul 2012 09:47:12 -0700
Subject: on destroy, also hide. issue #3880, pull #4104

---
 js/bootstrap-tooltip.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'js/bootstrap-tooltip.js')

diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js
index 02f84d470..f22aa8e64 100644
--- a/js/bootstrap-tooltip.js
+++ b/js/bootstrap-tooltip.js
@@ -236,6 +236,7 @@
     }
 
   , destroy: function () {
+      this.hide()
       this.$element.off(this.options.ns).removeData('tooltip')
     }
 
-- 
cgit v1.2.3


From 393f4a7b4244233a6ad24a48b68869329f4756b8 Mon Sep 17 00:00:00 2001
From: Jon Stevens <latchkey@gmail.com>
Date: Sun, 22 Jul 2012 14:19:11 -0700
Subject: simplify things to one line. pull #4104

---
 js/bootstrap-tooltip.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'js/bootstrap-tooltip.js')

diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js
index f22aa8e64..fa1c9a6c5 100644
--- a/js/bootstrap-tooltip.js
+++ b/js/bootstrap-tooltip.js
@@ -176,6 +176,8 @@
       $.support.transition && this.$tip.hasClass('fade') ?
         removeWithAnimation() :
         $tip.remove()
+        
+      return this
     }
 
   , fixTitle: function () {
@@ -236,8 +238,7 @@
     }
 
   , destroy: function () {
-      this.hide()
-      this.$element.off(this.options.ns).removeData('tooltip')
+      this.hide().$element.off(this.options.ns).removeData('tooltip')
     }
 
   }
-- 
cgit v1.2.3


From d76c8991424b91050636fb94e740daa123306e95 Mon Sep 17 00:00:00 2001
From: Jon Stevens <latchkey@gmail.com>
Date: Sun, 22 Jul 2012 14:36:23 -0700
Subject: remove the ns option

---
 js/bootstrap-tooltip.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'js/bootstrap-tooltip.js')

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);
-- 
cgit v1.2.3