53 lines
1.8 KiB
Diff
53 lines
1.8 KiB
Diff
--- jquery.tipTip_old.js 2011-11-14 21:40:55.000000000 +0100
|
|
+++ jquery.tipTip.js 2011-11-15 10:09:35.000000000 +0100
|
|
@@ -31,7 +31,7 @@
|
|
fadeIn: 200,
|
|
fadeOut: 200,
|
|
attribute: "title",
|
|
- content: false, // HTML or String to fill TipTIp with
|
|
+ content: false, // HTML String or function to fill TipTIp with
|
|
enter: function(){},
|
|
exit: function(){}
|
|
};
|
|
@@ -51,12 +51,7 @@
|
|
|
|
return this.each(function(){
|
|
var org_elem = $(this);
|
|
- if(opts.content){
|
|
- var org_title = opts.content;
|
|
- } else {
|
|
- var org_title = org_elem.attr(opts.attribute);
|
|
- }
|
|
- if(org_title != ""){
|
|
+ if(opts.content || org_elem.attr(opts.attribute)){
|
|
if(!opts.content){
|
|
org_elem.removeAttr(opts.attribute); //remove original Attribute
|
|
}
|
|
@@ -99,6 +94,8 @@
|
|
|
|
function active_tiptip(){
|
|
opts.enter.call(this);
|
|
+ var org_title = typeof opts.content === 'function' ? opts.content() : opts.content;
|
|
+ org_title = org_title || org_elem.attr(opts.attribute);
|
|
tiptip_content.html(org_title);
|
|
tiptip_holder.hide().removeAttr("class").css("margin","0");
|
|
tiptip_arrow.removeAttr("style");
|
|
@@ -176,8 +173,15 @@
|
|
tiptip_arrow.css({"margin-left": arrow_left+"px", "margin-top": arrow_top+"px"});
|
|
tiptip_holder.css({"margin-left": marg_left+"px", "margin-top": marg_top+"px"}).attr("class","tip"+t_class);
|
|
|
|
- if (timeout){ clearTimeout(timeout); }
|
|
- timeout = setTimeout(function(){ tiptip_holder.stop(true,true).fadeIn(opts.fadeIn); }, opts.delay);
|
|
+ if (timeout) {
|
|
+ clearTimeout(timeout);
|
|
+ }
|
|
+ timeout = setTimeout(function() {
|
|
+ tiptip_holder.stop(true,true);
|
|
+ if ($.contains(document.documentElement, org_elem[0])) {
|
|
+ tiptip_holder.fadeIn(opts.fadeIn);
|
|
+ }
|
|
+ }, opts.delay);
|
|
}
|
|
|
|
function deactive_tiptip(){
|