@ -56,7 +56,8 @@
moved ,
/** @const */
RSPACE = /\s+/g ,
R _SPACE = /\s+/g ,
R _FLOAT = /left|right|inline/ ,
expando = 'Sortable' + ( new Date ) . getTime ( ) ,
@ -67,7 +68,7 @@
$ = win . jQuery || win . Zepto ,
Polymer = win . Polymer ,
captureMode = { capture : false , passive : false } ,
captureMode = false ,
supportDraggable = ! ! ( 'draggable' in document . createElement ( 'div' ) ) ,
supportCssPointerEvents = ( function ( el ) {
@ -85,6 +86,7 @@
abs = Math . abs ,
min = Math . min ,
savedInputChecked = [ ] ,
touchDragOverListeners = [ ] ,
_autoScroll = _throttle ( function ( /**Event*/ evt , /**Object*/ options , /**HTMLElement*/ rootEl ) {
@ -213,7 +215,6 @@
;
/ * *
* @ class Sortable
* @ param { HTMLElement } el
@ -231,7 +232,6 @@
// Export instance
el [ expando ] = this ;
// Default options
var defaults = {
group : Math . random ( ) ,
@ -314,6 +314,9 @@
filter = options . filter ,
startIndex ;
_saveInputCheckedState ( el ) ;
// Don't trigger start event when an element is been dragged, otherwise the evt.oldindex always wrong when set option.group.
if ( dragEl ) {
return ;
@ -420,6 +423,7 @@
_on ( ownerDocument , 'touchend' , _this . _onDrop ) ;
_on ( ownerDocument , 'touchcancel' , _this . _onDrop ) ;
_on ( ownerDocument , 'pointercancel' , _this . _onDrop ) ;
_on ( ownerDocument , 'selectstart' , _this ) ;
if ( options . delay ) {
// If the user moves the pointer or let go the click or touch
@ -437,10 +441,8 @@
dragStartFn ( ) ;
}
if ( options . forceFallback ) {
evt . preventDefault ( ) ;
}
}
} ,
_disableDelayedDrag : function ( ) {
@ -457,6 +459,7 @@
_triggerDragStart : function ( /** Event */ evt , /** Touch */ touch ) {
touch = touch || ( evt . pointerType == 'touch' ? evt : null ) ;
if ( touch ) {
// Touch device support
tapEvt = {
@ -675,6 +678,7 @@
group = options . group ,
activeSortable = Sortable . active ,
isOwner = ( activeGroup === group ) ,
isMovingBetweenSortable = false ,
canSort = options . sort ;
if ( evt . preventDefault !== void 0 ) {
@ -682,6 +686,10 @@
! options . dragoverBubble && evt . stopPropagation ( ) ;
}
if ( dragEl . animated ) {
return ;
}
moved = true ;
if ( activeSortable && ! options . disabled &&
@ -706,7 +714,11 @@
target = _closest ( evt . target , options . draggable , el ) ;
dragRect = dragEl . getBoundingClientRect ( ) ;
if ( putSortable !== this ) {
putSortable = this ;
isMovingBetweenSortable = true ;
}
if ( revert ) {
_cloneHide ( activeSortable , true ) ;
@ -724,8 +736,13 @@
if ( ( el . children . length === 0 ) || ( el . children [ 0 ] === ghostEl ) ||
( el === evt . target ) && ( target = _ghostIsLast ( el , evt ) )
( el === evt . target ) && ( _ghostIsLast ( el , evt ) )
) {
//assign target only if condition is true
if ( el . children . length !== 0 && el . children [ 0 ] !== ghostEl && el === evt . target ) {
target = el . lastElementChild ;
}
if ( target ) {
if ( target . animated ) {
return ;
@ -757,13 +774,13 @@
var width = targetRect . right - targetRect . left ,
height = targetRect . bottom - targetRect . top ,
floating = /left|right|inline/ . test ( lastCSS . cssFloat + lastCSS . display )
floating = R _FLOAT . test ( lastCSS . cssFloat + lastCSS . display )
|| ( lastParentCSS . display == 'flex' && lastParentCSS [ 'flex-direction' ] . indexOf ( 'row' ) === 0 ) ,
isWide = ( target . offsetWidth > dragEl . offsetWidth ) ,
isLong = ( target . offsetHeight > dragEl . offsetHeight ) ,
halfway = ( floating ? ( evt . clientX - targetRect . left ) / width : ( evt . clientY - targetRect . top ) / height ) > 0.5 ,
nextSibling = target . nextElementSibling ,
after
after = false
;
if ( floating ) {
@ -778,7 +795,7 @@
} else {
after = tgTop > elTop ;
}
} else {
} else if ( ! isMovingBetweenSortable ) {
after = ( nextSibling !== dragEl ) && ! isLong || halfway && isLong ;
}
@ -850,6 +867,7 @@
_off ( ownerDocument , 'touchend' , this . _onDrop ) ;
_off ( ownerDocument , 'pointerup' , this . _onDrop ) ;
_off ( ownerDocument , 'touchcancel' , this . _onDrop ) ;
_off ( ownerDocument , 'selectstart' , this ) ;
} ,
_onDrop : function ( /**Event*/ evt ) {
@ -878,6 +896,11 @@
ghostEl && ghostEl . parentNode . removeChild ( ghostEl ) ;
if ( rootEl === parentEl || Sortable . active . lastPullMode !== 'clone' ) {
// Remove clone
cloneEl && cloneEl . parentNode . removeChild ( cloneEl ) ;
}
if ( dragEl ) {
if ( this . nativeDraggable ) {
_off ( dragEl , 'dragend' , this ) ;
@ -897,7 +920,6 @@
newIndex = _index ( dragEl , options . draggable ) ;
if ( newIndex >= 0 ) {
// Add event
_dispatchEvent ( null , parentEl , 'add' , dragEl , rootEl , oldIndex , newIndex ) ;
@ -910,9 +932,6 @@
}
}
else {
// Remove clone
cloneEl && cloneEl . parentNode . removeChild ( cloneEl ) ;
if ( dragEl . nextSibling !== nextEl ) {
// Get the index of the dragged element within its parent
newIndex = _index ( dragEl , options . draggable ) ;
@ -967,19 +986,31 @@
putSortable =
activeGroup =
Sortable . active = null ;
savedInputChecked . forEach ( function ( el ) {
el . checked = true ;
} ) ;
savedInputChecked . length = 0 ;
} ,
handleEvent : function ( /**Event*/ evt ) {
var type = evt . type ;
if ( type === 'dragover' || type === 'dragenter' ) {
switch ( evt . type ) {
case 'drop' :
case 'dragend' :
this . _onDrop ( evt ) ;
break ;
case 'dragover' :
case 'dragenter' :
if ( dragEl ) {
this . _onDragOver ( evt ) ;
_globalDragOver ( evt ) ;
}
}
else if ( type === 'drop' || type === 'dragend' ) {
this . _onDrop ( evt ) ;
break ;
case 'selectstart' :
evt . preventDefault ( ) ;
break ;
}
} ,
@ -1174,8 +1205,8 @@
el . classList [ state ? 'add' : 'remove' ] ( name ) ;
}
else {
var className = ( ' ' + el . className + ' ' ) . replace ( RSPACE , ' ' ) . replace ( ' ' + name + ' ' , ' ' ) ;
el . className = ( className + ( state ? ' ' + name : '' ) ) . replace ( RSPACE , ' ' ) ;
var className = ( ' ' + el . className + ' ' ) . replace ( R _ SPACE, ' ' ) . replace ( ' ' + name + ' ' , ' ' ) ;
el . className = ( className + ( state ? ' ' + name : '' ) ) . replace ( R _ SPACE, ' ' ) ;
}
}
}
@ -1293,10 +1324,8 @@
// 5 — min delta
// abs — нельзя добавлять, а то глюки при наведении сверху
return (
( evt . clientY - ( rect . top + rect . height ) > 5 ) ||
( evt . clientX - ( rect . right + rect . width ) > 5 )
) && lastEl ;
return ( evt . clientY - ( rect . top + rect . height ) > 5 ) ||
( evt . clientX - ( rect . left + rect . width ) > 5 ) ;
}
@ -1399,6 +1428,34 @@
) ;
}
function _saveInputCheckedState ( root ) {
var inputs = root . getElementsByTagName ( 'input' ) ;
var idx = inputs . length ;
while ( idx -- ) {
var el = inputs [ idx ] ;
el . checked && savedInputChecked . push ( el ) ;
}
}
// Fixed #973:
_on ( document , 'touchmove' , function ( evt ) {
if ( Sortable . active ) {
evt . preventDefault ( ) ;
}
} ) ;
try {
window . addEventListener ( 'test' , null , Object . defineProperty ( { } , 'passive' , {
get : function ( ) {
captureMode = {
capture : false ,
passive : false
} ;
}
} ) ) ;
} catch ( err ) { }
// Export utils
Sortable . utils = {
on : _on ,
@ -1428,6 +1485,6 @@
// Export
Sortable . version = '1.5.0-rc 1' ;
Sortable . version = '1.5.1' ;
return Sortable ;
} ) ;
desmaisons_david
8 years ago