From bce94ffbaa9051eb88d498fb5d64724d13d6449e Mon Sep 17 00:00:00 2001 From: Steven Black Date: Thu, 26 May 2011 15:41:01 -0400 Subject: [PATCH] jquery.mobile.collapsible.js: Whitespace to standards. Now passes jsHint. Signed-off-by: Steven Black --- js/jquery.mobile.collapsible.js | 197 ++++++++++++++++---------------- 1 file changed, 98 insertions(+), 99 deletions(-) diff --git a/js/jquery.mobile.collapsible.js b/js/jquery.mobile.collapsible.js index 9fe60f7d..0b77ead9 100644 --- a/js/jquery.mobile.collapsible.js +++ b/js/jquery.mobile.collapsible.js @@ -3,146 +3,145 @@ * Copyright (c) jQuery Project * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license -*/ -(function($, undefined ) { +*/ +( function( $, undefined ) { $.widget( "mobile.collapsible", $.mobile.widget, { options: { - expandCueText: ' click to expand contents', - collapseCueText: ' click to collapse contents', + expandCueText: " click to expand contents", + collapseCueText: " click to collapse contents", collapsed: false, - heading: '>:header,>legend', + heading: ">:header,>legend", theme: null, - iconTheme: 'd' + iconTheme: "d" }, _create: function(){ var $el = this.element, o = this.options, - collapsibleContain = $el.addClass('ui-collapsible-contain'), - collapsibleHeading = $el.find(o.heading).eq(0), - collapsibleContent = collapsibleContain.wrapInner('
').find('.ui-collapsible-content'), - collapsibleParent = $el.closest( ":jqmData(role='collapsible-set')" ).addClass('ui-collapsible-set'); - - //replace collapsibleHeading if it's a legend - if(collapsibleHeading.is('legend')){ - collapsibleHeading = $('
'+ collapsibleHeading.html() +'
').insertBefore(collapsibleHeading); + collapsibleContain = $el.addClass( "ui-collapsible-contain" ), + collapsibleHeading = $el.find( o.heading ).eq( 0 ), + collapsibleContent = collapsibleContain.wrapInner( '
' ).find( ".ui-collapsible-content" ), + collapsibleParent = $el.closest( ":jqmData(role='collapsible-set')" ).addClass( "ui-collapsible-set" ); + + //replace collapsibleHeading if it's a legend + if( collapsibleHeading.is( "legend" )){ + collapsibleHeading = $( '
'+ collapsibleHeading.html() +"
" ).insertBefore( collapsibleHeading ); collapsibleHeading.next().remove(); - } - + } + //drop heading in before content - collapsibleHeading.insertBefore(collapsibleContent); - + collapsibleHeading.insertBefore( collapsibleContent ); + //modify markup & attributes - collapsibleHeading.addClass('ui-collapsible-heading') - .append('') - .wrapInner('') - .find('a:eq(0)') - .buttonMarkup({ + collapsibleHeading.addClass( "ui-collapsible-heading" ) + .append( '' ) + .wrapInner( '' ) + .find( "a:eq(0)" ) + .buttonMarkup( { shadow: !!!collapsibleParent.length, corners:false, - iconPos: 'left', - icon: 'plus', + iconPos: "left", + icon: "plus", theme: o.theme - }) - .find('.ui-icon') - .removeAttr('class') - .buttonMarkup({ + } ) + .find( ".ui-icon" ) + .removeAttr( "class" ) + .buttonMarkup( { shadow: true, corners:true, - iconPos: 'notext', - icon: 'plus', + iconPos: "notext", + icon: "plus", theme: o.iconTheme - }); - + } ); + if( !collapsibleParent.length ){ collapsibleHeading - .find('a:eq(0)') - .addClass('ui-corner-all') - .find('.ui-btn-inner') - .addClass('ui-corner-all'); + .find( "a:eq(0)" ) + .addClass( "ui-corner-all" ) + .find( ".ui-btn-inner" ) + .addClass( "ui-corner-all" ); } else { - if( collapsibleContain.jqmData('collapsible-last') ){ + if( collapsibleContain.jqmData( "collapsible-last" ) ){ collapsibleHeading - .find('a:eq(0), .ui-btn-inner') - .addClass('ui-corner-bottom'); - } + .find( "a:eq(0), .ui-btn-inner" ) + .addClass( "ui-corner-bottom" ); + } } - - + //events - collapsibleContain - .bind('collapse', function(event){ + collapsibleContain + .bind( "collapse", function( event ){ if( !event.isDefaultPrevented() ){ event.preventDefault(); collapsibleHeading - .addClass('ui-collapsible-heading-collapsed') - .find('.ui-collapsible-heading-status').text(o.expandCueText); - - collapsibleHeading.find('.ui-icon').removeClass('ui-icon-minus').addClass('ui-icon-plus'); - collapsibleContent.addClass('ui-collapsible-content-collapsed').attr('aria-hidden',true); - - if( collapsibleContain.jqmData('collapsible-last') ){ + .addClass( "ui-collapsible-heading-collapsed" ) + .find( ".ui-collapsible-heading-status" ).text( o.expandCueText ); + + collapsibleHeading.find( ".ui-icon" ).removeClass( "ui-icon-minus" ).addClass( "ui-icon-plus" ); + collapsibleContent.addClass( "ui-collapsible-content-collapsed" ).attr( "aria-hidden", true ); + + if( collapsibleContain.jqmData( "collapsible-last" ) ){ collapsibleHeading - .find('a:eq(0), .ui-btn-inner') - .addClass('ui-corner-bottom'); - } - } - - }) - .bind('expand', function(event){ - if( !event.isDefaultPrevented() ){ - event.preventDefault(); - collapsibleHeading - .removeClass('ui-collapsible-heading-collapsed') - .find('.ui-collapsible-heading-status').text(o.collapseCueText); - - collapsibleHeading.find('.ui-icon').removeClass('ui-icon-plus').addClass('ui-icon-minus'); - collapsibleContent.removeClass('ui-collapsible-content-collapsed').attr('aria-hidden',false); - - if( collapsibleContain.jqmData('collapsible-last') ){ - collapsibleHeading - .find('a:eq(0), .ui-btn-inner') - .removeClass('ui-corner-bottom'); + .find( "a:eq(0), .ui-btn-inner" ) + .addClass( "ui-corner-bottom" ); } } - }) - .trigger(o.collapsed ? 'collapse' : 'expand'); - - + + } ) + .bind( "expand", function( event ){ + if( !event.isDefaultPrevented() ){ + event.preventDefault(); + collapsibleHeading + .removeClass( "ui-collapsible-heading-collapsed" ) + .find( ".ui-collapsible-heading-status" ).text( o.collapseCueText ); + + collapsibleHeading.find( ".ui-icon" ).removeClass( "ui-icon-plus" ).addClass( "ui-icon-minus" ); + collapsibleContent.removeClass( "ui-collapsible-content-collapsed" ).attr( "aria-hidden", false ); + + if( collapsibleContain.jqmData( "collapsible-last" ) ){ + collapsibleHeading + .find( "a:eq(0), .ui-btn-inner" ) + .removeClass( "ui-corner-bottom" ); + } + } + } ) + .trigger( o.collapsed ? "collapse" : "expand" ); + + //close others in a set - if( collapsibleParent.length && !collapsibleParent.jqmData("collapsiblebound") ){ + if( collapsibleParent.length && !collapsibleParent.jqmData( "collapsiblebound" ) ){ collapsibleParent - .jqmData("collapsiblebound", true) - .bind("expand", function( event ){ - $(this).find( ".ui-collapsible-contain" ) - .not( $(event.target).closest( ".ui-collapsible-contain" ) ) + .jqmData( "collapsiblebound", true ) + .bind( "expand", function( event ){ + $( this ).find( ".ui-collapsible-contain" ) + .not( $( event.target ).closest( ".ui-collapsible-contain" ) ) .not( "> .ui-collapsible-contain .ui-collapsible-contain" ) .trigger( "collapse" ); - }); + } ); - var set = collapsibleParent.find( ":jqmData(role=collapsible)" ) - + var set = collapsibleParent.find( ":jqmData(role=collapsible )" ); + set.first() - .find('a:eq(0)') - .addClass('ui-corner-top') - .find('.ui-btn-inner') - .addClass('ui-corner-top'); - - set.last().jqmData('collapsible-last', true) + .find( "a:eq(0)" ) + .addClass( "ui-corner-top" ) + .find( ".ui-btn-inner" ) + .addClass( "ui-corner-top" ); + + set.last().jqmData( "collapsible-last", true ); } - + collapsibleHeading - .bind("vclick", function(e){ - if( collapsibleHeading.is('.ui-collapsible-heading-collapsed') ){ - collapsibleContain.trigger('expand'); - } + .bind( "vclick", function( e ){ + if( collapsibleHeading.is( ".ui-collapsible-heading-collapsed" ) ){ + collapsibleContain.trigger( "expand" ); + } else { - collapsibleContain.trigger('collapse'); + collapsibleContain.trigger( "collapse" ); } e.preventDefault(); - }); + } ); } -}); -})( jQuery ); \ No newline at end of file +} ); +} )( jQuery ); \ No newline at end of file