Skip to content

Explicit parent #57

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

Explicit parent #57

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afdb2e2
Explicit parent
Progdom Feb 4, 2015
9e447a0
Merge branch 'master' into set-relative-parent
Progdom Aug 7, 2017
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
40 changes: 26 additions & 14 deletions src/angular-sortable-view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,17 @@
var mapKey = $interpolate($attrs.svRoot)($scope) || $scope.$id;
if(!ROOTS_MAP[mapKey]) ROOTS_MAP[mapKey] = [];

var that = this;
var candidates; // set of possible destinations
var $placeholder;// placeholder element
var options; // sortable options
var $helper; // helper element - the one thats being dragged around with the mouse pointer
var $original; // original element
var $target; // last best candidate
var isGrid = false;
var onSort = $parse($attrs.svOnSort);

var that = this;
var candidates; // set of possible destinations
var $placeholder; // placeholder element
var options; // sortable options
var $helper; // helper element - the one thats being dragged around with the mouse pointer
var $original; // original element
var $target; // last best candidate
var isGrid = false;
var onSort = $parse($attrs.svOnSort);
var parentIsRelative = $attrs.hasRelativeParent ? $($attrs.hasRelativeParent) : false;

// ----- hack due to https://github.com/angular/angular.js/issues/8044
$attrs.svOnStart = $attrs.$$element[0].attributes['sv-on-start'];
$attrs.svOnStart = $attrs.svOnStart && $attrs.svOnStart.value;
Expand Down Expand Up @@ -72,7 +73,7 @@
}).map(function(item){
return {
part: item.getPart().id,
y: item.element[0].getBoundingClientRect().top
y: !parentIsRelative ? item.element[0].getBoundingClientRect().top : (item.element[0].getBoundingClientRect().top - parentIsRelative.offset().top )
};
});
var dict = Object.create(null);
Expand All @@ -94,7 +95,18 @@
});
});
}


this.relativeParentOffset = function() {

if (!parentIsRelative)
return {
top: 0,
left: 0
};

return $(parentIsRelative).offset();
};

this.$moveUpdate = function(opts, mouse, svElement, svOriginal, svPlaceholder, originatingPart, originatingIndex){
var svRect = svElement[0].getBoundingClientRect();
if(opts.tolerance === 'element')
Expand Down Expand Up @@ -139,8 +151,8 @@

// ----- move the element
$helper[0].reposition({
x: mouse.x + document.body.scrollLeft - mouse.offset.x*svRect.width,
y: mouse.y + document.body.scrollTop - mouse.offset.y*svRect.height
x: (mouse.x + document.body.scrollLeft - mouse.offset.x*svRect.width) - that.relativeParentOffset().left,
y: (mouse.y + document.body.scrollTop - mouse.offset.y*svRect.height) - that.relativeParentOffset().top
});

// ----- manage candidates
Expand Down