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-popover.js | 3 +--
 js/bootstrap-tooltip.js | 7 +++----
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'js')

diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js
index 2a2b298dca..2e6d9c32a5 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 fa1c9a6c53..f9447410ec 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