Skip to content
This repository has been archived by the owner on Jun 14, 2020. It is now read-only.

Commit

Permalink
Added new suppress option that can turn 'title' attribute replacement…
Browse files Browse the repository at this point in the history 
… off on a per-element basis. $.fn overrides also updated to prevent recursion problems and other issues
  • Loading branch information
@Craga89
Craga89 committed Aug 8, 2011
1 parent 8e67905 commit afa4883
Show file tree
Hide file tree
Showing 6 changed files with 112 additions and 106 deletions.
70 changes: 36 additions & 34 deletions dist/jquery.qtip.basic.js
View file
Expand Up @@ -9,7 +9,7 @@
* http://en.wikipedia.org/wiki/MIT_License
* http://en.wikipedia.org/wiki/GNU_General_Public_License
*
* Date: Mon Aug 1 18:56:34 2011 +0100
* Date: Mon Aug 8 18:22:25 2011 +0100
*/

/*jslint browser: true, onevar: true, undef: true, nomen: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: true */
Expand Down Expand Up @@ -1460,7 +1460,7 @@ function QTip(target, options, id, attr)
$.removeData(t, 'qtip');

// Reset old title attribute if removed
if(title) {
if(options.suppress && title) {
$.attr(t, 'title', title);
target.removeAttr(oldtitle);
}
Expand Down Expand Up @@ -1547,7 +1547,7 @@ function init(id, opts)
}

// Remove title attribute and store it if present
if(title = $.attr(this, 'title')) {
if(config.suppress && (title = $.attr(this, 'title'))) {
$(this).removeAttr('title').attr(oldtitle, title);
}

Expand Down Expand Up @@ -1755,52 +1755,53 @@ PLUGINS = QTIP.plugins = {
) || FALSE,

/*
* jQuery-secpfic $.fn overrides
* jQuery-specific $.fn overrides
*/
fn: {
/* Allow other plugins to successfully retrieve the title of an element with a qTip applied */
attr: function(attr, val) {
if(!this.length) { return; }

var self = this[0],
title = 'title',
api = $.data(self, 'qtip');

if(attr === title) {
if(arguments.length < 2) {
return $.attr(self, oldtitle);
}
else if(typeof api === 'object') {
// If qTip is rendered and title was originally used as content, update it
if(api && api.rendered && api.options.content.attr === title && api.cache.attr) {
api.set('content.text', val);
if(this.length) {
var self = this[0],
title = 'title',
api = $.data(self, 'qtip');

if(attr === title && 'object' === typeof api && api.options.suppress) {
if(arguments.length < 2) {
return $.attr(self, oldtitle);
}
else {
// If qTip is rendered and title was originally used as content, update it
if(api && api.options.content.attr === title && api.cache.attr) {
api.set('content.text', val);
}

// Use the regular attr method to set, then cache the result
return this.attr(oldtitle, val);
}

// Use the regular attr method to set, then cache the result
$.fn['attr'+replaceSuffix].apply(this, arguments);
$.attr(self, oldtitle, $.attr(self, title));
return this.removeAttr(title);
}
}

return $.fn['attr'+replaceSuffix].apply(this, arguments);
},

/* Allow clone to correctly retrieve cached title attributes */
clone: function(keepData) {
var titles = $([]), title = 'title', elem;
var titles = $([]), title = 'title',

// Clone our element using the real clone method
elem = $.fn['clone'+replaceSuffix].apply(this, arguments)

// Grab all elements with an oldtitle set, and change it to regular title attribute
.filter('[oldtitle]').each(function() {
$.attr(this, title, $.attr(this, oldtitle));
this.removeAttribute(oldtitle);
})
.end();
elems = $.fn['clone'+replaceSuffix].apply(this, arguments);

// Grab all elements with an oldtitle set, and change it to regular title attribute, if keepData is false
if(!keepData) {
elems.filter('['+oldtitle+']').attr('title', function() {
return $.attr(this, oldtitle);
})
.removeAttr(oldtitle);
}

return elem;
return elems;
},

/*
* Taken directly from jQuery 1.8.2 widget source code
* Trigger 'remove' event on all elements on removal if jQuery UI isn't present
Expand Down Expand Up @@ -1840,6 +1841,7 @@ QTIP.defaults = {
prerender: FALSE,
id: FALSE,
overwrite: TRUE,
suppress: TRUE,
content: {
text: TRUE,
attr: 'title',
Expand Down
2 changes: 1 addition & 1 deletion dist/jquery.qtip.css
View file
Expand Up @@ -9,7 +9,7 @@
* http://en.wikipedia.org/wiki/MIT_License
* http://en.wikipedia.org/wiki/GNU_General_Public_License
*
* Date: Mon Aug 1 18:56:34 2011 +0100
* Date: Mon Aug 8 18:22:25 2011 +0100
*/

/* Core qTip styles */
Expand Down
70 changes: 36 additions & 34 deletions dist/jquery.qtip.js
View file
Expand Up @@ -9,7 +9,7 @@
* http://en.wikipedia.org/wiki/MIT_License
* http://en.wikipedia.org/wiki/GNU_General_Public_License
*
* Date: Mon Aug 1 18:56:34 2011 +0100
* Date: Mon Aug 8 18:22:25 2011 +0100
*/

/*jslint browser: true, onevar: true, undef: true, nomen: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: true */
Expand Down Expand Up @@ -1460,7 +1460,7 @@ function QTip(target, options, id, attr)
$.removeData(t, 'qtip');

// Reset old title attribute if removed
if(title) {
if(options.suppress && title) {
$.attr(t, 'title', title);
target.removeAttr(oldtitle);
}
Expand Down Expand Up @@ -1547,7 +1547,7 @@ function init(id, opts)
}

// Remove title attribute and store it if present
if(title = $.attr(this, 'title')) {
if(config.suppress && (title = $.attr(this, 'title'))) {
$(this).removeAttr('title').attr(oldtitle, title);
}

Expand Down Expand Up @@ -1755,52 +1755,53 @@ PLUGINS = QTIP.plugins = {
) || FALSE,

/*
* jQuery-secpfic $.fn overrides
* jQuery-specific $.fn overrides
*/
fn: {
/* Allow other plugins to successfully retrieve the title of an element with a qTip applied */
attr: function(attr, val) {
if(!this.length) { return; }

var self = this[0],
title = 'title',
api = $.data(self, 'qtip');

if(attr === title) {
if(arguments.length < 2) {
return $.attr(self, oldtitle);
}
else if(typeof api === 'object') {
// If qTip is rendered and title was originally used as content, update it
if(api && api.rendered && api.options.content.attr === title && api.cache.attr) {
api.set('content.text', val);
if(this.length) {
var self = this[0],
title = 'title',
api = $.data(self, 'qtip');

if(attr === title && 'object' === typeof api && api.options.suppress) {
if(arguments.length < 2) {
return $.attr(self, oldtitle);
}
else {
// If qTip is rendered and title was originally used as content, update it
if(api && api.options.content.attr === title && api.cache.attr) {
api.set('content.text', val);
}

// Use the regular attr method to set, then cache the result
return this.attr(oldtitle, val);
}

// Use the regular attr method to set, then cache the result
$.fn['attr'+replaceSuffix].apply(this, arguments);
$.attr(self, oldtitle, $.attr(self, title));
return this.removeAttr(title);
}
}

return $.fn['attr'+replaceSuffix].apply(this, arguments);
},

/* Allow clone to correctly retrieve cached title attributes */
clone: function(keepData) {
var titles = $([]), title = 'title', elem;
var titles = $([]), title = 'title',

// Clone our element using the real clone method
elem = $.fn['clone'+replaceSuffix].apply(this, arguments)

// Grab all elements with an oldtitle set, and change it to regular title attribute
.filter('[oldtitle]').each(function() {
$.attr(this, title, $.attr(this, oldtitle));
this.removeAttribute(oldtitle);
})
.end();
elems = $.fn['clone'+replaceSuffix].apply(this, arguments);

// Grab all elements with an oldtitle set, and change it to regular title attribute, if keepData is false
if(!keepData) {
elems.filter('['+oldtitle+']').attr('title', function() {
return $.attr(this, oldtitle);
})
.removeAttr(oldtitle);
}

return elem;
return elems;
},

/*
* Taken directly from jQuery 1.8.2 widget source code
* Trigger 'remove' event on all elements on removal if jQuery UI isn't present
Expand Down Expand Up @@ -1840,6 +1841,7 @@ QTIP.defaults = {
prerender: FALSE,
id: FALSE,
overwrite: TRUE,
suppress: TRUE,
content: {
text: TRUE,
attr: 'title',
Expand Down
4 changes: 2 additions & 2 deletions dist/jquery.qtip.min.js
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/jquery.qtip.pack.js
View file

Large diffs are not rendered by default.

68 changes: 35 additions & 33 deletions src/core.js
View file
Expand Up @@ -1397,7 +1397,7 @@ function QTip(target, options, id, attr)
$.removeData(t, 'qtip');

// Reset old title attribute if removed
if(title) {
if(options.suppress && title) {
$.attr(t, 'title', title);
target.removeAttr(oldtitle);
}
Expand Down Expand Up @@ -1484,7 +1484,7 @@ function init(id, opts)
}

// Remove title attribute and store it if present
if(title = $.attr(this, 'title')) {
if(config.suppress && (title = $.attr(this, 'title'))) {
$(this).removeAttr('title').attr(oldtitle, title);
}

Expand Down Expand Up @@ -1692,52 +1692,53 @@ PLUGINS = QTIP.plugins = {
) || FALSE,

/*
* jQuery-secpfic $.fn overrides
* jQuery-specific $.fn overrides
*/
fn: {
/* Allow other plugins to successfully retrieve the title of an element with a qTip applied */
attr: function(attr, val) {
if(!this.length) { return; }

var self = this[0],
title = 'title',
api = $.data(self, 'qtip');

if(attr === title) {
if(arguments.length < 2) {
return $.attr(self, oldtitle);
}
else if(typeof api === 'object') {
// If qTip is rendered and title was originally used as content, update it
if(api && api.rendered && api.options.content.attr === title && api.cache.attr) {
api.set('content.text', val);
if(this.length) {
var self = this[0],
title = 'title',
api = $.data(self, 'qtip');

This comment has been minimized.

Sign in to view

Copy link
@chrisjaure

chrisjaure Aug 12, 2011

I'm getting a "Too much recursion" error here in FF5 in some cases.

if(attr === title && 'object' === typeof api && api.options.suppress) {
if(arguments.length < 2) {
return $.attr(self, oldtitle);
}
else {
// If qTip is rendered and title was originally used as content, update it
if(api && api.options.content.attr === title && api.cache.attr) {
api.set('content.text', val);
}

// Use the regular attr method to set, then cache the result
return this.attr(oldtitle, val);
}

// Use the regular attr method to set, then cache the result
$.fn['attr'+replaceSuffix].apply(this, arguments);
$.attr(self, oldtitle, $.attr(self, title));
return this.removeAttr(title);
}
}

return $.fn['attr'+replaceSuffix].apply(this, arguments);
},

/* Allow clone to correctly retrieve cached title attributes */
clone: function(keepData) {
var titles = $([]), title = 'title', elem;
var titles = $([]), title = 'title',

// Clone our element using the real clone method
elem = $.fn['clone'+replaceSuffix].apply(this, arguments)

// Grab all elements with an oldtitle set, and change it to regular title attribute
.filter('[oldtitle]').each(function() {
$.attr(this, title, $.attr(this, oldtitle));
this.removeAttribute(oldtitle);
})
.end();
elems = $.fn['clone'+replaceSuffix].apply(this, arguments);

// Grab all elements with an oldtitle set, and change it to regular title attribute, if keepData is false
if(!keepData) {
elems.filter('['+oldtitle+']').attr('title', function() {
return $.attr(this, oldtitle);
})
.removeAttr(oldtitle);
}

return elem;
return elems;
},

/*
* Taken directly from jQuery 1.8.2 widget source code
* Trigger 'remove' event on all elements on removal if jQuery UI isn't present
Expand Down Expand Up @@ -1777,6 +1778,7 @@ QTIP.defaults = {
prerender: FALSE,
id: FALSE,
overwrite: TRUE,
suppress: TRUE,
content: {
text: TRUE,
attr: 'title',
Expand Down

0 comments on commit afa4883

Please sign in to comment.