[bootstrap 2] fix tooltip

jinroh · May 1, 2012 · 5abb0ff · 5abb0ff
1 parent bf1e6aa
commit 5abb0ff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/UI/js/kadohui.js b/UI/js/kadohui.js
@@ -98,8 +98,9 @@ KadOHui.init = function() {
         });
     });
 
-  $("[rel=tooltip]")
+  $(".tab-content")
     .tooltip({
+      selector : "[rel=tooltip]",
       title : function() {
         var self = $(this);
         if (self.is('time')) {

diff --git a/UI/js/vendor/bootstrap-tooltip.js b/UI/js/vendor/bootstrap-tooltip.js
@@ -210,8 +210,10 @@
         , $e = this.$element
         , o = this.options
 
-      title = $e.attr('data-original-title')
+      //hacking title : if an options.title is provided, force to use it.
-        || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
+      title = (typeof o.title !== 'undefined') ? 
+                    (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
+                  : $e.attr('data-original-title');
 
       return title
     }