library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2024-11-21 11:04:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Draggable: Cleanup.

Browse Source
This commit is contained in:
Scott González 2012-01-07 12:18:08 -05:00
parent bf9a9339e5
commit b7a0c6a4cf
1 changed files with 39 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
ui/jquery.ui.draggable.js vendored
View File

@ -1,7 +1,7 @@
/* /*
* jQuery UI Draggable @VERSION * jQuery UI Draggable @VERSION
* *
* CopyBottom 2011, AUTHORS.txt (http://jqueryui.com/about) * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT or GPL Version 2 licenses. * Dual licensed under the MIT or GPL Version 2 licenses.
* http://jquery.org/license * http://jquery.org/license
* *
@ -71,71 +71,45 @@ $.widget( "ui.draggable", $.ui.interaction, {
}, },
_handleScrolling: function( event ) { _handleScrolling: function( event ) {
var xScrollSpeed, yScrollSpeed, var scrollTop = this.scrollParent.scrollTop(),
distances = {},
scrollTop = this.scrollParent.scrollTop(),
scrollLeft = this.scrollParent.scrollLeft(), scrollLeft = this.scrollParent.scrollLeft(),
scrollSensitivity = 20, scrollSensitivity = 20,
baseSpeed = 5, baseSpeed = 5,
speed = function( distance ) { speed = function( distance ) {
return baseSpeed + Math.round( distance / 2 ); return baseSpeed + Math.round( distance / 2 );
},
}; // overflowOffset is only set when scrollParent is not doc/html
overflowLeft = this.overflowOffset ?
// overflowOffset is only set when scrollParent is not doc/html this.overflowOffset.left :
if ( !this.overflowOffset ) { scrollLeft,
overflowTop = this.overflowOffset ?
distances.xRight = ( this.overflow.width + scrollLeft ) - event.pageX; this.overflowOffset.top :
distances.xLeft = event.pageX - scrollLeft; scrollTop,
distances.yBottom = ( this.overflow.height + scrollTop ) - event.pageY; xRight = this.overflow.width + overflowLeft - event.pageX,
distances.yTop = event.pageY - scrollTop; xLeft = event.pageX - overflowLeft,
yBottom = this.overflow.height + overflowTop - event.pageY,
} else { yTop = event.pageY - overflowTop;
distances.xRight = ( this.overflow.width + this.overflowOffset.left ) - event.pageX;
distances.xLeft = event.pageX - this.overflowOffset.left;
distances.yBottom = ( this.overflow.height + this.overflowOffset.top ) - event.pageY;
distances.yTop = event.pageY - this.overflowOffset.top;
}
// Handle vertical scrolling // Handle vertical scrolling
if ( distances.yBottom < scrollSensitivity ) { if ( yBottom < scrollSensitivity ) {
this.scrollParent.scrollTop( scrollTop +
yScrollSpeed = speed( scrollSensitivity - distances.yBottom ); speed( scrollSensitivity - yBottom ) );
} else if ( yTop < scrollSensitivity ) {
this.scrollParent.scrollTop( scrollTop + yScrollSpeed ); this.scrollParent.scrollTop( scrollTop -
speed( scrollSensitivity - yTop ) );
}
else if ( distances.yTop < scrollSensitivity ) {
yScrollSpeed = speed( scrollSensitivity - distances.yTop );
this.scrollParent.scrollTop( scrollTop - yScrollSpeed );
} }
// Handle horizontal scrolling // Handle horizontal scrolling
if ( distances.xRight < scrollSensitivity ) { if ( xRight < scrollSensitivity ) {
this.scrollParent.scrollLeft( scrollLeft +
xScrollSpeed = speed( scrollSensitivity - distances.xRight ); speed( scrollSensitivity - xRight ) );
} else if ( xLeft < scrollSensitivity ) {
this.scrollParent.scrollLeft( scrollLeft + xScrollSpeed ); this.scrollParent.scrollLeft( scrollLeft -
speed( scrollSensitivity - xLeft ) );
} }
else if ( distances.xLeft < scrollSensitivity ) {
xScrollSpeed = speed( scrollSensitivity - distances.xLeft );
this.scrollParent.scrollLeft( scrollLeft - xScrollSpeed );
}
}, },
_start: function( event ) { _start: function( event ) {
var newLeft, newTop;
// The actual dragging element, should always be a jQuery object // The actual dragging element, should always be a jQuery object
this.dragEl = this.element; this.dragEl = this.element;
@ -177,17 +151,16 @@ $.widget( "ui.draggable", $.ui.interaction, {
}; };
// Cache the offset of scrollParent, if required for _handleScrolling // Cache the offset of scrollParent, if required for _handleScrolling
if ( this.scrollParent[0] !== this.document[0] && this.scrollParent[0].tagName !== 'HTML') { if ( this.scrollParent[0] !== this.document[0] && this.scrollParent[0].tagName !== "HTML" ) {
this.overflowOffset = this.scrollParent.offset(); this.overflowOffset = this.scrollParent.offset();
} }
this.overflow = {}; this.overflow = {
height: this.scrollParent[0] === this.document[0] ?
this.overflow.height = ( this.scrollParent[0] === this.document[0] ) ? this.window.height() : this.scrollParent.height(),
this.window.height() : this.scrollParent.height(); width: this.scrollParent[0] === this.document[0] ?
this.window.width() : this.scrollParent.width()
this.overflow.width = ( this.scrollParent[0] === this.document[0] ) ? };
this.window.width() : this.scrollParent.width();
this._preparePosition( event ); this._preparePosition( event );
@ -201,8 +174,6 @@ $.widget( "ui.draggable", $.ui.interaction, {
}, },
_move: function( event ) { _move: function( event ) {
var newLeft, newTop;
this._preparePosition( event ); this._preparePosition( event );
// If user stops propagation, leave helper there ( if there's one ), disallow any CSS changes // If user stops propagation, leave helper there ( if there's one ), disallow any CSS changes
@ -232,7 +203,6 @@ $.widget( "ui.draggable", $.ui.interaction, {
// Uses event to determine new position of draggable, before any override from callbacks // Uses event to determine new position of draggable, before any override from callbacks
// TODO: handle absolute element inside relative parent like a relative element // TODO: handle absolute element inside relative parent like a relative element
// possibly have user set flag to avoid DOM lookup
_preparePosition: function( event ) { _preparePosition: function( event ) {
var leftDiff = event.clientX - this.startCoords.left, var leftDiff = event.clientX - this.startCoords.left,
topDiff = event.clientY - this.startCoords.top, topDiff = event.clientY - this.startCoords.top,
@ -258,21 +228,17 @@ $.widget( "ui.draggable", $.ui.interaction, {
// Places draggable where mouse or user from callback indicates // Places draggable where mouse or user from callback indicates
_setCss: function( event ) { _setCss: function( event ) {
var newLeft, newTop, oTop, oLeft; var newLeft, newTop;
// User overriding left/top so shortcut math is no longer valid // User overriding left/top so shortcut math is no longer valid
if ( this.tempPosition.left !== this.position.left || this.tempPosition.top !== this.position.top ) { if ( this.tempPosition.left !== this.position.left || this.tempPosition.top !== this.position.top ) {
// Reset offset based on difference of expected and overridden values
// Get the difference of automatic coordinates vs what user overrode this.offset.top = this.offset.top +
oTop = this.position.top - this.tempPosition.top; this.position.top - this.tempPosition.top;
oLeft = this.position.left - this.tempPosition.left; this.offset.left = this.offset.left +
this.position.left - this.tempPosition.left;
// Reset offset based on math
this.offset.top = this.offset.top + oTop;
this.offset.left = this.offset.left + oLeft;
this.offset = this.dragEl.offset(); this.offset = this.dragEl.offset();
} }
newLeft = this.position.left; newLeft = this.position.left;