From 09eed560f87a122258818292ba3743f9382753c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Zaefferer?= Date: Wed, 24 Oct 2012 10:54:31 -0400 Subject: [PATCH] Accordion: Removed deprecated navigation options. Fixes #5870 - Accordion: Remove navigation options. --- .../accordion/accordion_common_deprecated.js | 2 -- tests/unit/accordion/accordion_deprecated.js | 30 ----------------- ui/jquery.ui.accordion.js | 32 ------------------- 3 files changed, 64 deletions(-) diff --git a/tests/unit/accordion/accordion_common_deprecated.js b/tests/unit/accordion/accordion_common_deprecated.js index 23324a0addc..9adb074c4ca 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 b8f4995423a..2fb509c442b 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 4f1a6674bf2..f9cf733d523 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, {