aboutsummaryrefslogtreecommitdiffstats
path: root/ui/jquery.ui.accordion.js
diff options
context:
space:
mode:
authorJörn Zaefferer <joern.zaefferer@gmail.com>2012-03-01 15:19:57 +0100
committerJörn Zaefferer <joern.zaefferer@gmail.com>2012-03-01 15:19:57 +0100
commitf65d6b92cc14ee3e829d6e941fcd07a5fb37b278 (patch)
tree1947006f1b9dbe073daabcfb732b09c52dd0c778 /ui/jquery.ui.accordion.js
parent63215a68757c4fa78079a48488d9a91f0ec8cf50 (diff)
parent2321ae06cbe44b86d14c82ebd452d06e3922dca9 (diff)
downloadjquery-ui-f65d6b92cc14ee3e829d6e941fcd07a5fb37b278.tar.gz
jquery-ui-f65d6b92cc14ee3e829d6e941fcd07a5fb37b278.zip
Merge branch 'data-naming'
Diffstat (limited to 'ui/jquery.ui.accordion.js')
-rw-r--r--ui/jquery.ui.accordion.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js
index 48e964a94..6c4432828 100644
--- a/ui/jquery.ui.accordion.js
+++ b/ui/jquery.ui.accordion.js
@@ -405,7 +405,7 @@ $.widget( "ui.accordion", {
animate = this.options.animate || {},
options = down && animate.down || animate,
complete = function() {
- toShow.removeData( "accordionHeight" );
+ toShow.removeData( "ui-accordion-height" );
that._completed( data );
};
@@ -430,7 +430,7 @@ $.widget( "ui.accordion", {
toHide.animate( hideProps, duration, easing );
toShow
.hide()
- .data( "accordionHeight", {
+ .data( "ui-accordion-height", {
total: total,
toHide: toHide
})
@@ -455,7 +455,7 @@ $.widget( "ui.accordion", {
$.fx.step.accordionHeight = function( fx ) {
var elem = $( fx.elem ),
- data = elem.data( "accordionHeight" );
+ data = elem.data( "ui-accordion-height" );
elem.height( data.total - elem.outerHeight() - data.toHide.outerHeight() + elem.height() );
};
var hideProps = {},