aboutsummaryrefslogtreecommitdiffstats
path: root/ui/jquery.ui.tooltip.js
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2012-03-14 13:42:48 -0400
committerScott González <scott.gonzalez@gmail.com>2012-03-14 13:42:48 -0400
commit682a321d1e4b80835a860f82fb686cff4943982b (patch)
tree6f49b28f40fb952977cdfbccb80dd553640dea4b /ui/jquery.ui.tooltip.js
parent94f85149db2a8b2540f9b204c14d57d8b087fbf6 (diff)
parentec062c1156d58726dc212e6e2191ee7196302c44 (diff)
downloadjquery-ui-682a321d1e4b80835a860f82fb686cff4943982b.tar.gz
jquery-ui-682a321d1e4b80835a860f82fb686cff4943982b.zip
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.tooltip.js')
-rw-r--r--ui/jquery.ui.tooltip.js16
1 files changed, 8 insertions, 8 deletions
diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index 6a41f8c4a..eddd9a0c9 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -1,7 +1,7 @@
/*
* jQuery UI Tooltip @VERSION
*
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT or GPL Version 2 licenses.
* http://jquery.org/license
*
@@ -72,7 +72,7 @@ $.widget( "ui.tooltip", {
var element = $( this );
if ( element.is( "[title]" ) ) {
element
- .data( "tooltip-title", element.attr( "title" ) )
+ .data( "ui-tooltip-title", element.attr( "title" ) )
.attr( "title", "" );
}
});
@@ -82,8 +82,8 @@ $.widget( "ui.tooltip", {
// restore title attributes
this.element.find( this.options.items ).andSelf().each(function() {
var element = $( this );
- if ( element.data( "tooltip-title" ) ) {
- element.attr( "title", element.data( "tooltip-title" ) );
+ if ( element.data( "ui-tooltip-title" ) ) {
+ element.attr( "title", element.data( "ui-tooltip-title" ) );
}
});
},
@@ -99,8 +99,8 @@ $.widget( "ui.tooltip", {
return;
}
- if ( !target.data( "tooltip-title" ) ) {
- target.data( "tooltip-title", target.attr( "title" ) );
+ if ( !target.data( "ui-tooltip-title" ) ) {
+ target.data( "ui-tooltip-title", target.attr( "title" ) );
}
target.data( "tooltip-open", true );
@@ -180,8 +180,8 @@ $.widget( "ui.tooltip", {
}
// only set title if we had one before (see comment in _open())
- if ( target.data( "tooltip-title" ) ) {
- target.attr( "title", target.data( "tooltip-title" ) );
+ if ( target.data( "ui-tooltip-title" ) ) {
+ target.attr( "title", target.data( "ui-tooltip-title" ) );
}
target.removeAttr( "aria-describedby" );