Skip to content

Fix for issue #92 - The element's original transform is discarded #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sphinxxxx wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for issue #92 - The element's original transform is discarded #120

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions draggabilly.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ function isElement( obj ) {
return obj instanceof HTMLElement;
}

// helps separate our temporary drag transform from other transforms on an element
function removeTranslateTransform( transform ) {
var cleanTransform = transform.replace( /translate(3d)?\(.*?\)/, '' );
return cleanTransform.trim();
}

// -------------------------- requestAnimationFrame -------------------------- //

// get rAF, prefixed, if present
Expand Down Expand Up @@ -383,7 +389,7 @@ proto.dragEnd = function( event, pointer ) {
}
// use top left position when complete
if ( transformProperty ) {
this.element.style[ transformProperty ] = '';
this.element.style[ transformProperty ] = removeTranslateTransform( this.element.style[ transformProperty ] );
this.setLeftTop();
}
this.element.classList.remove('is-dragging');
Expand Down Expand Up @@ -414,8 +420,12 @@ proto.setLeftTop = function() {
};

proto.positionDrag = function() {
this.element.style[ transformProperty ] = 'translate3d( ' + this.dragPoint.x +
'px, ' + this.dragPoint.y + 'px, 0)';
var transform = removeTranslateTransform( this.element.style[ transformProperty ] );
var translate = 'translate3d( ' + this.dragPoint.x + 'px, ' + this.dragPoint.y + 'px, 0)' + (transform ? ' ' : '');
// do translation before any other transforms, e.g. rotation,
// or else we'll be moving in the element's rotated coordinate system:
// https://staff.washington.edu/fmf/2011/07/15/css3-transform-attribute-order/
this.element.style[ transformProperty ] = translate + transform;
};

// ----- staticClick ----- //
Expand All @@ -440,7 +450,7 @@ proto.disable = function() {
proto.destroy = function() {
this.disable();
// reset styles
this.element.style[ transformProperty ] = '';
this.element.style[ transformProperty ] = removeTranslateTransform( this.element.style[ transformProperty ] );
this.element.style.left = '';
this.element.style.top = '';
this.element.style.position = '';
Expand Down