Skip to content
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

Unify snap modes #127

Merged
merged 8 commits into from
Dec 12, 2014
Merged

Unify snap modes #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
66adb21
Implement interact.createSnapGrid
taye Dec 9, 2014
5074f6e
Unify anchor, path, grid snap to a targets array
taye Dec 9, 2014
e552205
Tidy snapping code
taye Dec 9, 2014
5383d71
Remove snap range conversion from -1 to Infinity
taye Dec 9, 2014
2e4f798
Make new snapping backwards compatible
taye Dec 10, 2014
7701cff
demo/snap: Use unified target snapping
taye Dec 9, 2014
db67267
Fix snap range bug
taye Dec 10, 2014
44065ae
Fix problems with snapping functions
taye Dec 11, 2014
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
61 changes: 30 additions & 31 deletions demo/js/snap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,23 @@
prevY = 0,
blue = '#2299ee',
lightBlue = '#88ccff',
peppermint = '#44ee44',
tango = '#ff4400',
draggingAnchor = null;
draggingAnchor = null,

snapGrid = {
x: 10,
y: 10,
range: 10,
offset: { x: 0, y: 0 }
},
gridFunc = interact.createSnapGrid(snapGrid),
anchors = [
{x: 100, y: 100, range: 200},
{x: 600, y: 400, range: Infinity},
{x: 500, y: 150, range: Infinity},
{x: 250, y: 250, range: Infinity}
];


function drawGrid (grid, gridOffset, range) {
if (!grid.x || !grid.y) { return; }
Expand Down Expand Up @@ -88,13 +102,11 @@
context.clearRect(0, 0, width, height);
guidesContext.clearRect(0, 0, width, height);

if (!status.offMode.checked) {
if (snap.mode === 'grid') {
drawGrid(snap.grid, snap.gridOffset, snap.range);
}
else if (snap.mode === 'anchor') {
drawAnchors(snap.anchors, snap.range);
}
if (status.gridMode.checked) {
drawGrid(snapGrid, snapGrid.offset, snapGrid.range);
}
else if (status.anchorMode.checked) {
drawAnchors(anchors, snap.range);
}
}

Expand Down Expand Up @@ -144,7 +156,7 @@
draggingAnchor.x += event.dx;
draggingAnchor.y += event.dy;

drawAnchors(snap.anchors, snap.range);
drawAnchors(anchors, snap.range);
}
}

Expand All @@ -158,20 +170,12 @@
return;
}

interact(canvas).draggable({
snap: {
enabled: true,
grid: {
x: Number(status.gridX.value),
y: Number(status.gridY.value)
},
gridOffset: {
x: Number(status.offsetX.value),
y: Number(status.offsetY.value)
},
range: Number(status.range.value)
}
});
snapGrid.x = Number(status.gridX.value);
snapGrid.y = Number(status.gridY.value);
snapGrid.range = Number(status.range.value);

snapGrid.offset.x = Number(status.offsetX.value);
snapGrid.offset.y = Number(status.offsetY.value);

drawSnap(interact(canvas).draggable().snap);
}
Expand Down Expand Up @@ -211,18 +215,13 @@
interact(canvas)
.draggable({
snap: {
mode: status.anchorMode.checked? 'anchor': 'grid',
targets: status.gridMode.checked? [gridFunc] : status.anchorMode.checked? anchors : null,
enabled: !status.offMode.checked,
endOnly: status.endOnly.checked
}
})
.inertia(status.inertia.checked);

interact(canvas).draggable({
snap: {
enabled: !status.offMode.checked
}
});

drawSnap(interact(canvas).draggable().snap);
}

Expand Down
Loading