Skip to content

Commit 8a6d4c1

Browse files
arschmitzscottgonzalez
arschmitz
authored and
scottgonzalez
committed
Droppable: Fix line length issues
Ref gh-1690
1 parent 88f74e1 commit 8a6d4c1

1 file changed

Lines changed: 58 additions & 27 deletions

File tree

‎ui/widgets/droppable.js‎

Lines changed: 58 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,13 @@ $.widget( "ui.droppable", {
145145
var draggable = $.ui.ddmanager.current;
146146

147147
// Bail if draggable and droppable are same element
148-
if ( !draggable || ( draggable.currentItem || draggable.element )[ 0 ] === this.element[ 0 ] ) {
148+
if ( !draggable || ( draggable.currentItem ||
149+
draggable.element )[ 0 ] === this.element[ 0 ] ) {
149150
return;
150151
}
151152

152-
if ( this.accept.call( this.element[ 0 ], ( draggable.currentItem || draggable.element ) ) ) {
153+
if ( this.accept.call( this.element[ 0 ], ( draggable.currentItem ||
154+
draggable.element ) ) ) {
153155
this._addHoverClass();
154156
this._trigger( "over", event, this.ui( draggable ) );
155157
}
@@ -161,11 +163,13 @@ $.widget( "ui.droppable", {
161163
var draggable = $.ui.ddmanager.current;
162164

163165
// Bail if draggable and droppable are same element
164-
if ( !draggable || ( draggable.currentItem || draggable.element )[ 0 ] === this.element[ 0 ] ) {
166+
if ( !draggable || ( draggable.currentItem ||
167+
draggable.element )[ 0 ] === this.element[ 0 ] ) {
165168
return;
166169
}
167170

168-
if ( this.accept.call( this.element[ 0 ], ( draggable.currentItem || draggable.element ) ) ) {
171+
if ( this.accept.call( this.element[ 0 ], ( draggable.currentItem ||
172+
draggable.element ) ) ) {
169173
this._removeHoverClass();
170174
this._trigger( "out", event, this.ui( draggable ) );
171175
}
@@ -178,25 +182,38 @@ $.widget( "ui.droppable", {
178182
childrenIntersection = false;
179183

180184
// Bail if draggable and droppable are same element
181-
if ( !draggable || ( draggable.currentItem || draggable.element )[ 0 ] === this.element[ 0 ] ) {
185+
if ( !draggable || ( draggable.currentItem ||
186+
draggable.element )[ 0 ] === this.element[ 0 ] ) {
182187
return false;
183188
}
184189

185-
this.element.find( ":data(ui-droppable)" ).not( ".ui-draggable-dragging" ).each( function() {
186-
var inst = $( this ).droppable( "instance" );
187-
if (
188-
inst.options.greedy &&
189-
!inst.options.disabled &&
190-
inst.options.scope === draggable.options.scope &&
191-
inst.accept.call( inst.element[ 0 ], ( draggable.currentItem || draggable.element ) ) &&
192-
intersect( draggable, $.extend( inst, { offset: inst.element.offset() } ), inst.options.tolerance, event )
193-
) { childrenIntersection = true; return false; }
194-
} );
190+
this.element
191+
.find( ":data(ui-droppable)" )
192+
.not( ".ui-draggable-dragging" )
193+
.each( function() {
194+
var inst = $( this ).droppable( "instance" );
195+
if (
196+
inst.options.greedy &&
197+
!inst.options.disabled &&
198+
inst.options.scope === draggable.options.scope &&
199+
inst.accept.call(
200+
inst.element[ 0 ], ( draggable.currentItem || draggable.element )
201+
) &&
202+
intersect(
203+
draggable,
204+
$.extend( inst, { offset: inst.element.offset() } ),
205+
inst.options.tolerance, event
206+
)
207+
) {
208+
childrenIntersection = true;
209+
return false; }
210+
} );
195211
if ( childrenIntersection ) {
196212
return false;
197213
}
198214

199-
if ( this.accept.call( this.element[ 0 ], ( draggable.currentItem || draggable.element ) ) ) {
215+
if ( this.accept.call( this.element[ 0 ],
216+
( draggable.currentItem || draggable.element ) ) ) {
200217
this._removeActiveClass();
201218
this._removeHoverClass();
202219

@@ -247,8 +264,10 @@ var intersect = ( function() {
247264
return false;
248265
}
249266

250-
var x1 = ( draggable.positionAbs || draggable.position.absolute ).left + draggable.margins.left,
251-
y1 = ( draggable.positionAbs || draggable.position.absolute ).top + draggable.margins.top,
267+
var x1 = ( draggable.positionAbs ||
268+
draggable.position.absolute ).left + draggable.margins.left,
269+
y1 = ( draggable.positionAbs ||
270+
draggable.position.absolute ).top + draggable.margins.top,
252271
x2 = x1 + draggable.helperProportions.width,
253272
y2 = y1 + draggable.helperProportions.height,
254273
l = droppable.offset.left,
@@ -265,7 +284,8 @@ var intersect = ( function() {
265284
t < y1 + ( draggable.helperProportions.height / 2 ) && // Bottom Half
266285
y2 - ( draggable.helperProportions.height / 2 ) < b ); // Top Half
267286
case "pointer":
268-
return isOverAxis( event.pageY, t, droppable.proportions().height ) && isOverAxis( event.pageX, l, droppable.proportions().width );
287+
return isOverAxis( event.pageY, t, droppable.proportions().height ) &&
288+
isOverAxis( event.pageX, l, droppable.proportions().width );
269289
case "touch":
270290
return (
271291
( y1 >= t && y1 <= b ) || // Top edge touching
@@ -298,7 +318,8 @@ $.ui.ddmanager = {
298318
droppablesLoop: for ( i = 0; i < m.length; i++ ) {
299319

300320
// No disabled and non-accepted
301-
if ( m[ i ].options.disabled || ( t && !m[ i ].accept.call( m[ i ].element[ 0 ], ( t.currentItem || t.element ) ) ) ) {
321+
if ( m[ i ].options.disabled || ( t && !m[ i ].accept.call( m[ i ].element[ 0 ],
322+
( t.currentItem || t.element ) ) ) ) {
302323
continue;
303324
}
304325

@@ -321,7 +342,10 @@ $.ui.ddmanager = {
321342
}
322343

323344
m[ i ].offset = m[ i ].element.offset();
324-
m[ i ].proportions( { width: m[ i ].element[ 0 ].offsetWidth, height: m[ i ].element[ 0 ].offsetHeight } );
345+
m[ i ].proportions( {
346+
width: m[ i ].element[ 0 ].offsetWidth,
347+
height: m[ i ].element[ 0 ].offsetHeight
348+
} );
325349

326350
}
327351

@@ -336,11 +360,13 @@ $.ui.ddmanager = {
336360
if ( !this.options ) {
337361
return;
338362
}
339-
if ( !this.options.disabled && this.visible && intersect( draggable, this, this.options.tolerance, event ) ) {
363+
if ( !this.options.disabled && this.visible &&
364+
intersect( draggable, this, this.options.tolerance, event ) ) {
340365
dropped = this._drop.call( this, event ) || dropped;
341366
}
342367

343-
if ( !this.options.disabled && this.visible && this.accept.call( this.element[ 0 ], ( draggable.currentItem || draggable.element ) ) ) {
368+
if ( !this.options.disabled && this.visible && this.accept.call( this.element[ 0 ],
369+
( draggable.currentItem || draggable.element ) ) ) {
344370
this.isout = true;
345371
this.isover = false;
346372
this._deactivate.call( this, event );
@@ -352,7 +378,8 @@ $.ui.ddmanager = {
352378
},
353379
dragStart: function( draggable, event ) {
354380

355-
// Listen for scrolling so that if the dragging causes scrolling the position of the droppables can be recalculated (see #5003)
381+
// Listen for scrolling so that if the dragging causes scrolling the position of the
382+
// droppables can be recalculated (see #5003)
356383
draggable.element.parentsUntil( "body" ).on( "scroll.droppable", function() {
357384
if ( !draggable.options.refreshPositions ) {
358385
$.ui.ddmanager.prepareOffsets( draggable, event );
@@ -361,7 +388,8 @@ $.ui.ddmanager = {
361388
},
362389
drag: function( draggable, event ) {
363390

364-
// If you have a highly dynamic page, you might try this option. It renders positions every time you move the mouse.
391+
// If you have a highly dynamic page, you might try this option. It renders positions
392+
// every time you move the mouse.
365393
if ( draggable.options.refreshPositions ) {
366394
$.ui.ddmanager.prepareOffsets( draggable, event );
367395
}
@@ -375,7 +403,9 @@ $.ui.ddmanager = {
375403

376404
var parentInstance, scope, parent,
377405
intersects = intersect( draggable, this, this.options.tolerance, event ),
378-
c = !intersects && this.isover ? "isout" : ( intersects && !this.isover ? "isover" : null );
406+
c = !intersects && this.isover ?
407+
"isout" :
408+
( intersects && !this.isover ? "isover" : null );
379409
if ( !c ) {
380410
return;
381411
}
@@ -417,7 +447,8 @@ $.ui.ddmanager = {
417447
dragStop: function( draggable, event ) {
418448
draggable.element.parentsUntil( "body" ).off( "scroll.droppable" );
419449

420-
// Call prepareOffsets one final time since IE does not fire return scroll events when overflow was caused by drag (see #5003)
450+
// Call prepareOffsets one final time since IE does not fire return scroll events when
451+
// overflow was caused by drag (see #5003)
421452
if ( !draggable.options.refreshPositions ) {
422453
$.ui.ddmanager.prepareOffsets( draggable, event );
423454
}

0 commit comments

Comments
 (0)