From dc2760025c571e5ef80d04e7b0903357d8d2f03c Mon Sep 17 00:00:00 2001 From: Mat Marquis Date: Sun, 22 Jan 2012 13:35:36 -0500 Subject: [PATCH] Moved function to outside each loop, to prevent it from being redefined each time the controlgroup widget is called. --- js/jquery.mobile.controlGroup.js | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/js/jquery.mobile.controlGroup.js b/js/jquery.mobile.controlGroup.js index 7753f87e..d1186182 100644 --- a/js/jquery.mobile.controlGroup.js +++ b/js/jquery.mobile.controlGroup.js @@ -7,9 +7,14 @@ define( [ "jquery", "jquery.mobile.buttonMarkup" ], function( $ ) { (function( $, undefined ) { $.fn.controlgroup = function( options ) { + function flipClasses( els, flCorners ) { + els.removeClass( "ui-btn-corner-all ui-shadow" ) + .eq( 0 ).addClass( flCorners[ 0 ] ) + .end() + .last().addClass( flCorners[ 1 ] ).addClass( "ui-controlgroup-last" ); + } return this.each(function() { - var $el = $( this ), o = $.extend({ direction: $el.jqmData( "type" ) || "vertical", @@ -29,17 +34,8 @@ $.fn.controlgroup = function( options ) { $el.addClass( "ui-corner-all ui-controlgroup ui-controlgroup-" + o.direction ); - // TODO: This should be moved out to the closure - // otherwise it is redefined each time controlgroup() is called - function flipClasses( els ) { - els.removeClass( "ui-btn-corner-all ui-shadow" ) - .eq( 0 ).addClass( flCorners[ 0 ] ) - .end() - .last().addClass( flCorners[ 1 ] ).addClass( "ui-controlgroup-last" ); - } - - flipClasses( $el.find( ".ui-btn" + ( o.excludeInvisible ? ":visible" : "" ) ) ); - flipClasses( $el.find( ".ui-btn-inner" ) ); + flipClasses( $el.find( ".ui-btn" + ( o.excludeInvisible ? ":visible" : "" ) ), flCorners ); + flipClasses( $el.find( ".ui-btn-inner" ), flCorners ); if ( o.shadow ) { $el.addClass( "ui-shadow" );