Skip to content
Permalink
Browse files

Accordion: Removed deprecated navigation options. Fixes #5870 - Accor…

…dion: Remove navigation options.
  • Loading branch information...
jzaefferer committed Oct 24, 2012
1 parent 0cdd559 commit 09eed560f87a122258818292ba3743f9382753c3
@@ -13,8 +13,6 @@ TestHelpers.commonWidgetTests( "accordion", {
"header": "ui-icon-triangle-1-e",
"headerSelected": "ui-icon-triangle-1-s"
},
navigation: false,
navigationFilter: function() {},

// callbacks
activate: null,
@@ -143,36 +143,6 @@ test( "resize", function() {



module( "accordion (deprecated) - navigation", setupTeardown() );

test( "{ navigation: true, navigationFilter: header }", function() {
expect( 2 );
var element = $( "#navigation" ).accordion({
navigation: true,
navigationFilter: function() {
return (/\?p=1\.1\.3$/).test( this.href );
}
});
equal( element.accordion( "option", "active" ), 2 );
state( element, 0, 0, 1 );
});

test( "{ navigation: true, navigationFilter: content }", function() {
expect( 2 );
var element = $( "#navigation" ).accordion({
navigation: true,
navigationFilter: function() {
return (/\?p=1\.1\.3\.2$/).test( this.href );
}
});
equal( element.accordion( "option", "active" ), 2 );
state( element, 0, 0, 1 );
});





module( "accordion (deprecated) - changestart/change events", setupTeardown() );

test( "changestart", function() {
@@ -544,38 +544,6 @@ $.widget( "ui.accordion", {

// DEPRECATED
if ( $.uiBackCompat !== false ) {
// navigation options
(function( $, prototype ) {
$.extend( prototype.options, {
navigation: false,
navigationFilter: function() {
return this.href.toLowerCase() === location.href.toLowerCase();
}
});

var _create = prototype._create;
prototype._create = function() {
if ( this.options.navigation ) {
var that = this,
headers = this.element.find( this.options.header ),
content = headers.next(),
current = headers.add( content )
.find( "a" )
.filter( this.options.navigationFilter )
[ 0 ];
if ( current ) {
headers.add( content ).each( function( index ) {
if ( $.contains( this, current ) ) {
that.options.active = Math.floor( index / 2 );
return false;
}
});
}
}
_create.call( this );
};
}( jQuery, jQuery.ui.accordion.prototype ) );

// icon options
(function( $, prototype ) {
$.extend( prototype.options.icons, {

0 comments on commit 09eed56

Please sign in to comment.
You can’t perform that action at this time.