Skip to content

Scale modifier added #214

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Scale modifier added #214

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
676d474
Scale modifier added
Jan 6, 2016
6dbd1a9
has touch delay increased to 500 ms (click fix)
zaynyatyi Mar 28, 2016
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
7 changes: 5 additions & 2 deletions ngDraggable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ angular.module("ngDraggable", [])
// to identify the element in order to prevent getting superflous events when a single element has both drag and drop directives on it.
var _myid = scope.$id;
var _data = null;
var _scale = null;

var _dragOffset = null;

Expand All @@ -47,6 +48,7 @@ angular.module("ngDraggable", [])
var allowTransform = angular.isDefined(attrs.allowTransform) ? scope.$eval(attrs.allowTransform) : true;

var getDragData = $parse(attrs.ngDragData);
var getDragScale = $parse(attrs.ngDragScale) || null;

// deregistration function for mouse move events in $rootScope triggered by jqLite trigger handler
var _deregisterRootMoveListener = angular.noop;
Expand Down Expand Up @@ -123,7 +125,7 @@ angular.module("ngDraggable", [])
_pressTimer = setTimeout(function(){
cancelPress();
onlongpress(evt);
},100);
},500);
$document.on(_moveEvents, cancelPress);
$document.on(_releaseEvents, cancelPress);
}else{
Expand Down Expand Up @@ -182,6 +184,7 @@ angular.module("ngDraggable", [])

if (!element.hasClass('dragging')) {
_data = getDragData(scope);
_scale = getDragScale(scope) || 1;
element.addClass('dragging');
$rootScope.$broadcast('draggable:start', {x:_mx, y:_my, tx:_tx, ty:_ty, event:evt, element:element, data:_data});

Expand All @@ -203,7 +206,7 @@ angular.module("ngDraggable", [])
_ty = _my - _mry - _dragOffset.top;
}

moveElement(_tx, _ty);
moveElement(_tx / _scale, _ty / _scale);

$rootScope.$broadcast('draggable:move', { x: _mx, y: _my, tx: _tx, ty: _ty, event: evt, element: element, data: _data, uid: _myid, dragOffset: _dragOffset });
};
Expand Down