aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJörn Zaefferer <joern.zaefferer@gmail.com>2012-10-24 10:54:31 -0400
committerJörn Zaefferer <joern.zaefferer@gmail.com>2012-10-24 17:44:06 -0400
commit09eed560f87a122258818292ba3743f9382753c3 (patch)
treebd0f0b9d79f3e2d4548c9b4756b59d33ff1fa3fd
parent0cdd5591be15b2d605191656f3468f36f7d5a94d (diff)
downloadjquery-ui-09eed560f87a122258818292ba3743f9382753c3.tar.gz
jquery-ui-09eed560f87a122258818292ba3743f9382753c3.zip
Accordion: Removed deprecated navigation options. Fixes #5870 - Accordion: Remove navigation options.
-rw-r--r--tests/unit/accordion/accordion_common_deprecated.js2
-rw-r--r--tests/unit/accordion/accordion_deprecated.js30
-rw-r--r--ui/jquery.ui.accordion.js32
3 files changed, 0 insertions, 64 deletions
diff --git a/tests/unit/accordion/accordion_common_deprecated.js b/tests/unit/accordion/accordion_common_deprecated.js
index 23324a0ad..9adb074c4 100644
--- a/tests/unit/accordion/accordion_common_deprecated.js
+++ b/tests/unit/accordion/accordion_common_deprecated.js
@@ -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,
diff --git a/tests/unit/accordion/accordion_deprecated.js b/tests/unit/accordion/accordion_deprecated.js
index b8f499542..2fb509c44 100644
--- a/tests/unit/accordion/accordion_deprecated.js
+++ b/tests/unit/accordion/accordion_deprecated.js
@@ -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() {
diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js
index 4f1a6674b..f9cf733d5 100644
--- a/ui/jquery.ui.accordion.js
+++ b/ui/jquery.ui.accordion.js
@@ -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, {