Skip to content

fixing for issue 117 #236

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 3 commits into
base: master
Choose a base branch
from
Open

fixing for issue 117 #236

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f5f18b
fixing for issu 117
gansky-alexander Apr 4, 2016
0eba5e6
fix(drag_with_scroll) fix scroll
AndriiChymyrys Apr 20, 2016
2ab6086
Merge pull request #1 from mindteam/drag_with_scroll
AndriiChymyrys Apr 20, 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
28 changes: 24 additions & 4 deletions ngDraggable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,12 @@ angular.module("ngDraggable", [])
var _dragHandle;

// 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 _myid = false;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't var _myid = attrs.id || scope.$id; suffice instead?

if(attrs.id) {
_myid = attrs.id;
} else {
_myid = scope.$id;
}
var _data = null;

var _dragOffset = null;
Expand All @@ -44,13 +49,16 @@ angular.module("ngDraggable", [])
var onDragStartCallback = $parse(attrs.ngDragStart) || null;
var onDragStopCallback = $parse(attrs.ngDragStop) || null;
var onDragSuccessCallback = $parse(attrs.ngDragSuccess) || null;
var idWithScroll = attrs.ngScrollId || null;
var allowTransform = angular.isDefined(attrs.allowTransform) ? scope.$eval(attrs.allowTransform) : true;

var getDragData = $parse(attrs.ngDragData);

// deregistration function for mouse move events in $rootScope triggered by jqLite trigger handler
var _deregisterRootMoveListener = angular.noop;

var _scrollTop = 0;

var initialize = function () {
element.attr('draggable', 'false'); // prevent native drag
// check to see if drag handle(s) was specified
Expand Down Expand Up @@ -149,6 +157,9 @@ angular.module("ngDraggable", [])
_dragOffset = {left:document.body.scrollLeft, top:document.body.scrollTop};
}

if (idWithScroll) {
_scrollTop = element.parents().find('#' + idWithScroll).scrollTop();
}

element.centerX = element[0].offsetWidth / 2;
element.centerY = element[0].offsetHeight / 2;
Expand All @@ -162,7 +173,7 @@ angular.module("ngDraggable", [])
_ty = _my - element.centerY - $window.pageYOffset;
} else {
_tx = _mx - _mrx - $window.pageXOffset;
_ty = _my - _mry - $window.pageYOffset;
_ty = _my - _mry - $window.pageYOffset - _scrollTop;
}

$document.on(_moveEvents, onmove);
Expand Down Expand Up @@ -192,6 +203,10 @@ angular.module("ngDraggable", [])
}
}

if (idWithScroll) {
_scrollTop = element.parents().find('#' + idWithScroll).scrollTop();
}

_mx = ngDraggable.inputEvent(evt).pageX;//ngDraggable.getEventProp(evt, 'pageX');
_my = ngDraggable.inputEvent(evt).pageY;//ngDraggable.getEventProp(evt, 'pageY');

Expand All @@ -200,7 +215,7 @@ angular.module("ngDraggable", [])
_ty = _my - element.centerY - _dragOffset.top;
} else {
_tx = _mx - _mrx - _dragOffset.left;
_ty = _my - _mry - _dragOffset.top;
_ty = _my - _mry - _dragOffset.top - _scrollTop;
}

moveElement(_tx, _ty);
Expand Down Expand Up @@ -271,7 +286,12 @@ angular.module("ngDraggable", [])

var _lastDropTouch=null;

var _myid = scope.$id;
var _myid = false;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See above.

if(attrs.id) {
_myid = attrs.id;
} else {
_myid = scope.$id;
}

var _dropEnabled=false;

Expand Down