Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[bootstrap 2] fix tooltip

  • Loading branch information...
commit 5abb0ffec90a0df72462d326b594065d1a447b6a 1 parent bf1e6aa
@alexstrat alexstrat authored
Showing with 6 additions and 3 deletions.
  1. +2 −1  UI/js/kadohui.js
  2. +4 −2 UI/js/vendor/bootstrap-tooltip.js
View
3  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')) {
View
6 UI/js/vendor/bootstrap-tooltip.js
@@ -210,8 +210,10 @@
, $e = this.$element
, o = this.options
- title = $e.attr('data-original-title')
- || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title)
+ //hacking title : if an options.title is provided, force to use it.
+ title = (typeof o.title !== 'undefined') ?
+ (typeof o.title == 'function' ? o.title.call($e[0]) : o.title)
+ : $e.attr('data-original-title');
return title
}
Please sign in to comment.
Something went wrong with that request. Please try again.