Skip to content
Permalink
Browse files

Fix various coding style issues

  • Loading branch information
jzaefferer committed Oct 16, 2013
1 parent 89ae764 commit 0e192979d0401c8cfe889b116fffc43cc85bb9fa
@@ -86,7 +86,7 @@ $.widget( "ui.autocomplete", {
suppressInput = false;
suppressKeyPressRepeat = false;
var keyCode = $.ui.keyCode;
switch( event.keyCode ) {
switch ( event.keyCode ) {
case keyCode.PAGE_UP:
suppressKeyPress = true;
this._move( "previousPage", event );
@@ -149,7 +149,7 @@ $.widget( "ui.autocomplete", {

// replicate some key handlers to allow them to repeat in Firefox and Opera
var keyCode = $.ui.keyCode;
switch( event.keyCode ) {
switch ( event.keyCode ) {
case keyCode.PAGE_UP:
this._move( "previousPage", event );
break;
@@ -570,7 +570,6 @@ $.extend( $.ui.autocomplete, {
}
});


// live region extension, adding a `messages` option
// NOTE: This is an experimental API. We are still investigating
// a full solution for string manipulation and internationalization.
@@ -211,10 +211,6 @@ if ( $( "<a>" ).data( "a-b", "a" ).removeData( "a-b" ).data( "a-b" ) ) {
})( $.fn.removeData );
}





// deprecated
$.ui.ie = !!/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() );

@@ -284,7 +284,7 @@ $.ui.ddmanager = {
}

// Filter out elements in the current dragged item
for ( j=0; j < list.length; j++ ) {
for ( j = 0; j < list.length; j++ ) {
if ( list[ j ] === m[ i ].element[ 0 ] ) {
m[ i ].proportions().height = 0;
continue droppablesLoop;
@@ -362,7 +362,7 @@ $.ui.ddmanager = {
if ( this.options.greedy ) {
// find droppable parents with same scope
scope = this.options.scope;
parent = this.element.parents( ":data(ui-droppable)" ).filter(function () {
parent = this.element.parents( ":data(ui-droppable)" ).filter(function() {
return $( this ).droppable( "instance" ).options.scope === scope;
});

@@ -56,7 +56,7 @@ $.effects.effect.blind = function( o, done ) {
// start at 0 if we are showing
if ( show ) {
wrapper.css( ref, 0 );
if ( ! motion ) {
if ( !motion ) {
wrapper.css( ref2, margin + distance );
}
}
@@ -41,11 +41,11 @@ $.effects.effect.explode = function( o, done ) {
}

// clone the element for each row and cell.
for( i = 0; i < rows ; i++ ) { // ===>
for ( i = 0; i < rows ; i++ ) { // ===>
top = offset.top + i * height;
my = i - ( rows - 1 ) / 2 ;

for( j = 0; j < cells ; j++ ) { // |||
for ( j = 0; j < cells ; j++ ) { // |||
left = offset.left + j * width;
mx = j - ( cells - 1 ) / 2 ;

@@ -42,7 +42,7 @@ $.effects.effect.scale = function( o, done ) {

// Set default origin and restore for show/hide
if ( mode !== "effect" ) {
options.origin = origin || ["middle","center"];
options.origin = origin || [ "middle", "center" ];
options.restore = true;
}

@@ -22,7 +22,7 @@ $.effects.effect.shake = function( o, done ) {
distance = o.distance || 20,
times = o.times || 3,
anims = times * 2 + 1,
speed = Math.round(o.duration/anims),
speed = Math.round( o.duration / anims ),
ref = (direction === "up" || direction === "down") ? "top" : "left",
positiveMotion = (direction === "up" || direction === "left"),
animation = {},
@@ -125,7 +125,7 @@ $.effects.effect.size = function( o, done ) {
hProps = hProps.concat([ "marginLeft", "marginRight" ]);
props2 = props0.concat(vProps).concat(hProps);

el.find( "*[width]" ).each( function(){
el.find( "*[width]" ).each( function() {
var child = $( this ),
c_original = {
height: child.height(),
@@ -183,7 +183,7 @@ $.effects.effect.size = function( o, done ) {
if ( el.to.opacity === 0 ) {
el.css( "opacity", el.from.opacity );
}
if( mode === "hide" ) {
if ( mode === "hide" ) {
el.hide();
}
$.effects.restore( el, props );
@@ -22,8 +22,8 @@ $.effects.effect.transfer = function( o, done ) {
fixLeft = targetFixed ? body.scrollLeft() : 0,
endPosition = target.offset(),
animation = {
top: endPosition.top - fixTop ,
left: endPosition.left - fixLeft ,
top: endPosition.top - fixTop,
left: endPosition.left - fixLeft,
height: target.innerHeight(),
width: target.innerWidth()
},
@@ -32,8 +32,8 @@ $.effects.effect.transfer = function( o, done ) {
.appendTo( document.body )
.addClass( o.className )
.css({
top: startPosition.top - fixTop ,
left: startPosition.left - fixLeft ,
top: startPosition.top - fixTop,
left: startPosition.left - fixLeft,
height: elem.innerHeight(),
width: elem.innerWidth(),
position: targetFixed ? "fixed" : "absolute"
@@ -33,7 +33,7 @@ $.effects = {
// plusequals test for += 100 -= 100
rplusequals = /^([\-+])=\s*(\d+\.?\d*)/,
// a set of RE's that can match strings and generate color tuples.
stringParsers = [{
stringParsers = [ {
re: /rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,
parse: function( execResult ) {
return [
@@ -84,7 +84,7 @@ $.effects = {
execResult[ 4 ]
];
}
}],
} ],

// jQuery.Color( )
color = jQuery.Color = function( color, green, blue, alpha ) {
@@ -443,18 +443,18 @@ color.fn.parse.prototype = color.fn;
function hue2rgb( p, q, h ) {
h = ( h + 1 ) % 1;
if ( h * 6 < 1 ) {
return p + (q - p) * h * 6;
return p + ( q - p ) * h * 6;
}
if ( h * 2 < 1) {
return q;
}
if ( h * 3 < 2 ) {
return p + (q - p) * ((2/3) - h) * 6;
return p + ( q - p ) * ( ( 2 / 3 ) - h ) * 6;
}
return p;
}

spaces.hsla.to = function ( rgba ) {
spaces.hsla.to = function( rgba ) {
if ( rgba[ 0 ] == null || rgba[ 1 ] == null || rgba[ 2 ] == null ) {
return [ null, null, null, rgba[ 3 ] ];
}
@@ -491,7 +491,7 @@ spaces.hsla.to = function ( rgba ) {
return [ Math.round(h) % 360, s, l, a == null ? 1 : a ];
};

spaces.hsla.from = function ( hsla ) {
spaces.hsla.from = function( hsla ) {
if ( hsla[ 0 ] == null || hsla[ 1 ] == null || hsla[ 2 ] == null ) {
return [ null, null, null, hsla[ 3 ] ];
}
@@ -510,7 +510,6 @@ spaces.hsla.from = function ( hsla ) {
];
};


each( spaces, function( spaceName, space ) {
var props = space.props,
cache = space.cache,
@@ -680,7 +679,6 @@ colors = jQuery.Color.names = {

})( jQuery );


/******************************************************************************/
/****************************** CLASS ANIMATIONS ******************************/
/******************************************************************************/
@@ -735,7 +733,6 @@ function getElementStyles( elem ) {
return styles;
}


function styleDifference( oldStyle, newStyle ) {
var diff = {},
name, value;
@@ -897,7 +894,7 @@ $.extend( $.effects, {

// Saves a set of properties in a data storage
save: function( element, set ) {
for( var i=0; i < set.length; i++ ) {
for ( var i = 0; i < set.length; i++ ) {
if ( set[ i ] !== null ) {
element.data( dataSpace + set[ i ], element[ 0 ].style[ set[ i ] ] );
}
@@ -907,7 +904,7 @@ $.extend( $.effects, {
// Restores a set of previously saved properties from a data storage
restore: function( element, set ) {
var val, i;
for( i=0; i < set.length; i++ ) {
for ( i = 0; i < set.length; i++ ) {
if ( set[ i ] !== null ) {
val = element.data( dataSpace + set[ i ] );
// support: jQuery 1.6.2
@@ -1040,7 +1037,6 @@ $.extend( $.effects, {
}
}


return element;
},

@@ -1250,10 +1246,10 @@ $.each( [ "Quad", "Cubic", "Quart", "Quint", "Expo" ], function( i, name ) {
});

$.extend( baseEasings, {
Sine: function ( p ) {
Sine: function( p ) {
return 1 - Math.cos( p * Math.PI / 2 );
},
Circ: function ( p ) {
Circ: function( p ) {
return 1 - Math.sqrt( 1 - p * p );
},
Elastic: function( p ) {
@@ -1263,7 +1259,7 @@ $.extend( baseEasings, {
Back: function( p ) {
return p * p * ( 3 * p - 2 );
},
Bounce: function ( p ) {
Bounce: function( p ) {
var pow2,
bounce = 4;

@@ -56,7 +56,9 @@ $.widget("ui.mouse", {

_mouseDown: function(event) {
// don't let more than one widget handle mouseStart
if( mouseHandled ) { return; }
if ( mouseHandled ) {
return;
}

// we may have missed mouseup (out of window)
(this._mouseStarted && this._mouseUp(event));
@@ -114,9 +116,9 @@ $.widget("ui.mouse", {
// IE mouseup check - mouseup happened when mouse was out of window
if ($.ui.ie && ( !document.documentMode || document.documentMode < 9 ) && !event.button) {
return this._mouseUp(event);
}

// Iframe mouseup check - mouseup occurred in another document
else if ( !event.which ) {
} else if ( !event.which ) {
return this._mouseUp( event );
}

@@ -400,8 +400,7 @@ $.ui.position = {
if ( newOverRight < 0 || newOverRight < abs( overLeft ) ) {
position.left += myOffset + atOffset + offset;
}
}
else if ( overRight > 0 ) {
} else if ( overRight > 0 ) {
newOverLeft = position.left - data.collisionPosition.marginLeft + myOffset + atOffset + offset - offsetLeft;
if ( newOverLeft > 0 || abs( newOverLeft ) < overRight ) {
position.left += myOffset + atOffset + offset;
@@ -435,8 +434,7 @@ $.ui.position = {
if ( ( position.top + myOffset + atOffset + offset) > overTop && ( newOverBottom < 0 || newOverBottom < abs( overTop ) ) ) {
position.top += myOffset + atOffset + offset;
}
}
else if ( overBottom > 0 ) {
} else if ( overBottom > 0 ) {
newOverTop = position.top - data.collisionPosition.marginTop + myOffset + atOffset + offset - offsetTop;
if ( ( position.top + myOffset + atOffset + offset) > overBottom && ( newOverTop > 0 || abs( newOverTop ) < overBottom ) ) {
position.top += myOffset + atOffset + offset;
@@ -457,7 +455,7 @@ $.ui.position = {
};

// fraction support test
(function () {
(function() {
var testElement, testElementParent, testElementStyle, offsetLeft, i,
body = document.getElementsByTagName( "body" )[ 0 ],
div = document.createElement( "div" );
@@ -83,7 +83,7 @@ $.widget("ui.selectable", $.ui.mouse, {
var that = this,
options = this.options;

this.opos = [event.pageX, event.pageY];
this.opos = [ event.pageX, event.pageY ];

if (this.options.disabled) {
return;
@@ -166,7 +166,7 @@ $.widget("ui.selectable", $.ui.mouse, {

if (x1 > x2) { tmp = x2; x2 = x1; x1 = tmp; }
if (y1 > y2) { tmp = y2; y2 = y1; y1 = tmp; }
this.helper.css({left: x1, top: y1, width: x2-x1, height: y2-y1});
this.helper.css({ left: x1, top: y1, width: x2 - x1, height: y2 - y1 });

this.selectees.each(function() {
var selectee = $.data(this, "selectable-item"),
@@ -423,7 +423,7 @@ $.widget( "ui.slider", $.ui.mouse, {
this.options.value = this._values( 0 );
this.options.values = null;
} else if ( value === "max" ) {
this.options.value = this._values( this.options.values.length-1 );
this.options.value = this._values( this.options.values.length - 1 );
this.options.values = null;
}
}
@@ -301,7 +301,7 @@ $.widget( "ui.spinner", {
if ( incremental ) {
return $.isFunction( incremental ) ?
incremental( i ) :
Math.floor( i*i*i/50000 - i*i/500 + 17*i/200 + 1 );
Math.floor( i * i * i / 50000 - i * i / 500 + 17 * i / 200 + 1 );
}

return 1;

0 comments on commit 0e19297

Please sign in to comment.
You can’t perform that action at this time.