Skip to content
This repository has been archived by the owner on Oct 8, 2021. It is now read-only.

Commit

Permalink
Coding standards: liberal spacing, functions go snug to front if it's…
Browse files Browse the repository at this point in the history 
… the only argument.
  • Loading branch information
@jaspermdegroot
jaspermdegroot committed Jul 9, 2012
1 parent f1bd924 commit b44271e
Show file tree
Hide file tree
Showing 6 changed files with 116 additions and 116 deletions.
18 changes: 9 additions & 9 deletions js/widgets/forms/button.js
View file
Expand Up @@ -31,8 +31,8 @@ $.widget( "mobile.button", $.mobile.widget, {
$buttonPlaceholder;

// if this is a link, check if it's been enhanced and, if not, use the right function
if( $el[ 0 ].tagName === "A" ) {
if( !$el.hasClass( "ui-btn" ) ) {
if ( $el[ 0 ].tagName === "A" ) {
if ( !$el.hasClass( "ui-btn" ) ) {
$el.buttonMarkup();
}

Expand All @@ -46,18 +46,18 @@ $.widget( "mobile.button", $.mobile.widget, {
}

// TODO: Post 1.1--once we have time to test thoroughly--any classes manually applied to the original element should be carried over to the enhanced element, with an `-enhanced` suffix. See https://github.com/jquery/jquery-mobile/issues/3577
/* if( $el[0].className.length ) {
/* if ( $el[0].className.length ) {
classes = $el[0].className;
} */
if( !!~$el[0].className.indexOf( "ui-btn-left" ) ) {
if ( !!~$el[0].className.indexOf( "ui-btn-left" ) ) {
classes = "ui-btn-left";
}

if( !!~$el[0].className.indexOf( "ui-btn-right" ) ) {
if ( !!~$el[0].className.indexOf( "ui-btn-right" ) ) {
classes = "ui-btn-right";
}

if( $el.attr( "type" ) === "submit" || $el.attr( "type" ) === "reset" ) {
if ( $el.attr( "type" ) === "submit" || $el.attr( "type" ) === "reset" ) {
classes ? classes += " ui-submit" : classes = "ui-submit";
}
$( "label[for='" + $el.attr( "id" ) + "']" ).addClass( "ui-submit" );
Expand Down Expand Up @@ -87,15 +87,15 @@ $.widget( "mobile.button", $.mobile.widget, {
if ( type !== "button" && type !== "reset" && name ) {
$el.bind( "vclick", function() {
// Add hidden input if it doesn't already exist.
if( $buttonPlaceholder === undefined ) {
if ( $buttonPlaceholder === undefined ) {
$buttonPlaceholder = $( "<input>", {
type: "hidden",
name: $el.attr( "name" ),
value: $el.attr( "value" )
}).insertBefore( $el );

// Bind to doc to remove after submit handling
$( document ).one("submit", function(){
$( document ).one( "submit", function() {
$buttonPlaceholder.remove();

// reset the local var so that the hidden input
Expand Down Expand Up @@ -146,7 +146,7 @@ $.widget( "mobile.button", $.mobile.widget, {
});

//auto self-init widgets
$( document ).bind( "pagecreate create", function( e ){
$( document ).bind( "pagecreate create", function( e ) {
$.mobile.button.prototype.enhanceWithin( e.target, true );
});

Expand Down
22 changes: 11 additions & 11 deletions js/widgets/forms/checkboxradio.js
View file
Expand Up @@ -27,7 +27,7 @@ $.widget( "mobile.checkboxradio", $.mobile.widget, {
// NOTE: Windows Phone could not find the label through a selector
// filter works though.
parentLabel = $( input ).closest( "label" ),
label = parentLabel.length ? parentLabel : $( input ).closest( "form,fieldset,:jqmData(role='page'),:jqmData(role='dialog')" ).find( "label" ).filter( "[for='" + input[0].id + "']" ),
label = parentLabel.length ? parentLabel : $( input ).closest( "form, fieldset, :jqmData(role='page'), :jqmData(role='dialog')" ).find( "label" ).filter( "[for='" + input[0].id + "']" ),
inputtype = input[0].type,
mini = inheritAttr( input, "mini" ),
checkedState = inputtype + "-on",
Expand Down Expand Up @@ -55,7 +55,7 @@ $.widget( "mobile.checkboxradio", $.mobile.widget, {
});

// If there's no selected theme check the data attr
if( !this.options.theme ) {
if ( !this.options.theme ) {
this.options.theme = $.mobile.getInheritedTheme( this.element, "c" );
}

Expand Down Expand Up @@ -114,13 +114,13 @@ $.widget( "mobile.checkboxradio", $.mobile.widget, {
},

vclick: function() {
var $this = $(this);
var $this = $( this );

// Adds checked attribute to checked input when keyboard is used
if ( $this.is( ":checked" ) ) {

$this.prop( "checked", true);
self._getInputSet().not($this).prop( "checked", false );
self._getInputSet().not( $this ).prop( "checked", false );
} else {

$this.prop( "checked", false );
Expand All @@ -143,25 +143,25 @@ $.widget( "mobile.checkboxradio", $.mobile.widget, {

_cacheVals: function() {
this._getInputSet().each(function() {
$(this).jqmData( "cacheVal", this.checked );
$( this ).jqmData( "cacheVal", this.checked );
});
},

//returns either a set of radios with the same name attribute, or a single checkbox
_getInputSet: function(){
if(this.inputtype === "checkbox") {
_getInputSet: function() {
if ( this.inputtype === "checkbox" ) {
return this.element;
}

return this.element.closest( "form,fieldset,:jqmData(role='page'),:jqmData(role='dialog')" )
.find( "input[name='"+ this.element[0].name +"'][type='"+ this.inputtype +"']" );
return this.element.closest( "form, fieldset, :jqmData(role='page'), :jqmData(role='dialog')" )
.find( "input[name='" + this.element[0].name + "'][type='" + this.inputtype + "']" );
},

_updateAll: function() {
var self = this;

this._getInputSet().each(function() {
var $this = $(this);
var $this = $( this );

if ( this.checked || self.inputtype === "checkbox" ) {
$this.trigger( "change" );
Expand Down Expand Up @@ -200,7 +200,7 @@ $.widget( "mobile.checkboxradio", $.mobile.widget, {
});

//auto self-init widgets
$( document ).bind( "pagecreate create", function( e ){
$( document ).bind( "pagecreate create", function( e ) {
$.mobile.checkboxradio.prototype.enhanceWithin( e.target, true );
});

Expand Down
82 changes: 41 additions & 41 deletions js/widgets/forms/select.custom.js
View file
Expand Up @@ -22,7 +22,7 @@ define( [
"../page.sections" ], function( $ ) {
//>>excludeEnd("jqmBuildExclude");
(function( $, undefined ) {
var extendSelect = function( widget ){
var extendSelect = function( widget ) {

var select = widget.select,
selectID = widget.selectID,
Expand Down Expand Up @@ -60,7 +60,7 @@ define( [
menuPageClose,
headerClose;

if( widget.isMultiple ) {
if ( widget.isMultiple ) {
headerClose = $( "<a>", {
"text": widget.options.closeText,
"href": "#",
Expand Down Expand Up @@ -112,13 +112,13 @@ define( [

// Events for list items
self.list.attr( "role", "listbox" )
.bind( "focusin", function( e ){
.bind( "focusin", function( e ) {
$( e.target )
.attr( "tabindex", "0" )
.trigger( "vmouseover" );

})
.bind( "focusout", function( e ){
.bind( "focusout", function( e ) {
$( e.target )
.attr( "tabindex", "-1" )
.trigger( "vmouseout" );
Expand Down Expand Up @@ -168,7 +168,7 @@ define( [
case 38:
prev = li.prev().not( ".ui-selectmenu-placeholder" );

if( prev.is( ".ui-li-divider" ) ) {
if ( prev.is( ".ui-li-divider" ) ) {
prev = prev.prev();
}

Expand All @@ -186,7 +186,7 @@ define( [
case 40:
next = li.next();

if( next.is( ".ui-li-divider" ) ) {
if ( next.is( ".ui-li-divider" ) ) {
next = next.next();
}

Expand Down Expand Up @@ -236,8 +236,8 @@ define( [
});

// Close button on small overlays
if( self.isMultiple ){
self.headerClose.click( function() {
if ( self.isMultiple ) {
self.headerClose.click(function() {
if ( self.menuType === "overlay" ) {
self.close();
return false;
Expand All @@ -261,10 +261,10 @@ define( [
},

selected: function() {
return this._selectOptions().filter( ":selected:not(:jqmData(placeholder='true'))" );
return this._selectOptions().filter( ":selected:not( :jqmData(placeholder='true') )" );
},

refresh: function( forceRebuild , foo ){
refresh: function( forceRebuild , foo ) {
var self = this,
select = this.element,
isMultiple = this.isMultiple,
Expand Down Expand Up @@ -294,7 +294,7 @@ define( [
if ( self.isMultiple ) {
item.find( ".ui-icon" ).removeClass( "ui-icon-checkbox-off" ).addClass( "ui-icon-checkbox-on" );
} else {
if( item.is( ".ui-selectmenu-placeholder" ) ) {
if ( item.is( ".ui-selectmenu-placeholder" ) ) {
item.next().addClass( $.mobile.activeBtnClass );
} else {
item.addClass( $.mobile.activeBtnClass );
Expand Down Expand Up @@ -353,7 +353,7 @@ define( [
function focusMenuItem() {
var selector = self.list.find( "." + $.mobile.activeBtnClass + " a" );
if ( selector.length === 0 ) {
selector = self.list.find( "li.ui-btn:not(:jqmData(placeholder='true')) a" );
selector = self.list.find( "li.ui-btn:not( :jqmData(placeholder='true') ) a" );
}
selector.first().focus().closest( "li" ).addClass( "ui-btn-down-" + widget.options.theme );
}
Expand Down Expand Up @@ -412,7 +412,7 @@ define( [

self.list.empty().filter( ".ui-listview" ).listview( "destroy" );

var $options = self.select.find("option"),
var $options = self.select.find( "option" ),
numOptions = $options.length,
select = this.select[ 0 ],
dataPrefix = 'data-' + $.mobile.ns,
Expand All @@ -424,32 +424,32 @@ define( [
isPlaceholderItem = false,
optGroup;

for (var i = 0; i < numOptions;i++, isPlaceholderItem = false){
for (var i = 0; i < numOptions;i++, isPlaceholderItem = false) {
var option = $options[i],
$option = $(option),
$option = $( option ),
parent = option.parentNode,
text = $option.text(),
anchor = document.createElement('a'),
anchor = document.createElement( 'a' ),
classes = [];

anchor.setAttribute('href','#');
anchor.appendChild(document.createTextNode(text));
anchor.setAttribute( 'href', '#' );
anchor.appendChild( document.createTextNode( text ) );

// Are we inside an optgroup?
if (parent !== select && parent.nodeName.toLowerCase() === "optgroup"){
var optLabel = parent.getAttribute('label');
if ( optLabel !== optGroup) {
var divider = document.createElement('li');
divider.setAttribute(dataRoleAttr,'list-divider');
divider.setAttribute('role','option');
divider.setAttribute('tabindex','-1');
divider.appendChild(document.createTextNode(optLabel));
fragment.appendChild(divider);
if ( parent !== select && parent.nodeName.toLowerCase() === "optgroup" ) {
var optLabel = parent.getAttribute( 'label' );
if ( optLabel !== optGroup ) {
var divider = document.createElement( 'li' );
divider.setAttribute( dataRoleAttr, 'list-divider' );
divider.setAttribute( 'role', 'option' );
divider.setAttribute( 'tabindex', '-1' );
divider.appendChild( document.createTextNode( optLabel ) );
fragment.appendChild( divider );
optGroup = optLabel;
}
}

if (needPlaceholder && (!option.getAttribute( "value" ) || text.length === 0 || $option.jqmData( "placeholder" ))) {
if ( needPlaceholder && ( !option.getAttribute( "value" ) || text.length === 0 || $option.jqmData( "placeholder" ) ) ) {
needPlaceholder = false;
isPlaceholderItem = true;

Expand All @@ -468,19 +468,19 @@ define( [
classes.push( "ui-disabled" );
item.setAttribute('aria-disabled',true);
}
item.setAttribute(dataIndexAttr,i);
item.setAttribute(dataIconAttr,dataIcon);
item.setAttribute( dataIndexAttr,i );
item.setAttribute( dataIconAttr, dataIcon );
if ( isPlaceholderItem ) {
item.setAttribute( dataPlaceholderAttr, true );
}
item.className = classes.join(" ");
item.setAttribute('role','option');
anchor.setAttribute('tabindex','-1');
item.appendChild(anchor);
fragment.appendChild(item);
item.className = classes.join( " " );
item.setAttribute( 'role', 'option' );
anchor.setAttribute( 'tabindex', '-1' );
item.appendChild( anchor );
fragment.appendChild( item );
}

self.list[0].appendChild(fragment);
self.list[0].appendChild( fragment );

// Hide header if it's not a multiselect and there's no placeholder
if ( !this.isMultiple && !placeholder.length ) {
Expand All @@ -493,7 +493,7 @@ define( [
self.list.listview();
},

_button: function(){
_button: function() {
return $( "<a>", {
"href": "#",
"role": "button",
Expand All @@ -508,12 +508,12 @@ define( [
});
};

// issue #3894 - core doesn't triggered events on disabled delegates
$( document ).bind( "selectmenubeforecreate", function( event ){
// issue #3894 - core doesn't trigger events on disabled delegates
$( document ).bind( "selectmenubeforecreate", function( event ) {
var selectmenuWidget = $( event.target ).data( "selectmenu" );

if( !selectmenuWidget.options.nativeMenu &&
selectmenuWidget.element.parents(":jqmData(role='popup')").length === 0 ){
if ( !selectmenuWidget.options.nativeMenu &&
selectmenuWidget.element.parents( ":jqmData(role='popup')" ).length === 0 ) {
extendSelect( selectmenuWidget );
}
});
Expand Down

0 comments on commit b44271e

Please sign in to comment.