Commit Graph

76 Commits

Author SHA1 Message Date
Tom MacWright
a8f5ab206e Merge branch 'master' into discard-tags
Inline discardTags

Conflicts:
	index.html
2013-02-07 16:51:38 -05:00
Tom MacWright
843926009d Normalize coordinates so that lasso can be dragged in any direction 2013-02-07 16:32:03 -05:00
Tom MacWright
f0b761b979 Lasso action 2013-02-07 16:21:25 -05:00
Ansis Brammanis
246481ad92 Switch back to mouseup, and block following click 2013-02-06 18:53:46 -05:00
Ansis Brammanis
2ca4387f74 Fix snapping nodes to areas
In the future it may be good to use shadow paths, but at this point
there isn't really a reason to add thousands of additional paths.
2013-02-06 17:42:51 -05:00
Tom MacWright
3440f4254d Discard tags 2013-02-06 16:22:39 -05:00
Tom MacWright
b11e50048e Merge branch 'master' of github.com:systemed/iD 2013-02-06 15:09:51 -05:00
Tom MacWright
a9632a2c7a Do not trigger radial on double click 2013-02-06 15:09:40 -05:00
Ansis Brammanis
0acab34054 Draw click event triggered by click instead of up 2013-02-06 15:06:50 -05:00
Ansis Brammanis
a4bf7c689f Merge DragNode and DragMidpoint
Adds shared behaviors such as snapping to DragMidpoint
2013-02-06 10:49:58 -05:00
Ansis Brammanis
14fc1d9c0d Fix flickering after redrawing active elems 2013-02-05 18:47:28 -05:00
Tom MacWright
356fd6edd5 Back off on replacing the location to 1/5 of previous throttle 2013-02-05 17:59:26 -05:00
Tom MacWright
4b76b136fa Fix tests for faux click 2013-02-05 15:58:54 -05:00
Tom MacWright
4a024651b4 Allow long clicks 2013-02-05 15:44:50 -05:00
Tom MacWright
9743fdf477 Up the radius tolerance to 12px 2013-02-05 15:41:56 -05:00
Tom MacWright
0e0ca2382e Half-second 2013-02-05 15:40:23 -05:00
Tom MacWright
f65803d99f Make restriction both space and time 2013-02-05 15:39:58 -05:00
Tom MacWright
67632d638f Soft clicking. Feels pretty nice. Refs #530 2013-02-05 15:27:02 -05:00
John Firebaugh
675c39187c Fix point dragging 2013-02-05 09:27:16 -08:00
John Firebaugh
c9fb1444db Connect via drag and drop
Fixes #598.
2013-02-04 16:48:54 -08:00
Ansis Brammanis
c8ab057f19 Remove unused midpoint code 2013-02-04 18:26:45 -05:00
Ansis Brammanis
3417a1639c Hide midpoints when drawing (no snapping) 2013-02-04 17:16:14 -05:00
Ansis Brammanis
1b70a68214 Revert "Don't snap to midpoints, snap to their parent way"
This reverts commit 13b0b540a7.

Conflicts:

	js/id/behavior/draw_way.js
2013-02-04 17:14:56 -05:00
Ansis Brammanis
d756e3c2a2 Let ways be self-intersected 2013-02-04 16:30:19 -05:00
Ansis Brammanis
83e241083d Remove event 2013-02-04 15:30:59 -05:00
John Firebaugh
6dd1bebe89 Fix drawing in Firefox (fixes #628) 2013-02-04 12:26:57 -08:00
Tom MacWright
6e74456b31 Fix dragging around resized edges. Fixes #552 2013-02-04 14:57:43 -05:00
Ansis Brammanis
e4a8fbd0f6 Eliminate flickering 2013-02-04 13:34:14 -05:00
Ansis Brammanis
4bfc91cc85 Fix dragging cursor off of edge while drawing 2013-02-04 12:34:11 -05:00
Tom MacWright
4ee620cb09 Namespace selectors to iD-owned elements 2013-02-04 12:23:46 -05:00
Tom MacWright
e5ad28feb7 JShint fixups 2013-02-04 12:10:23 -05:00
Ansis Brammanis
240d83c1fd Fix #623, get enitity from current graph 2013-02-04 10:54:39 -05:00
Ansis Brammanis
13b0b540a7 Don't snap to midpoints, snap to their parent way 2013-02-02 23:47:29 -05:00
John Firebaugh
33f5db4d96 Fix hash with selected id 2013-02-02 21:17:43 -05:00
John Firebaugh
3da0e70c0f Shift-selection 2013-02-01 14:31:47 -05:00
John Firebaugh
fe49e8fb77 Pass around context rather than map 2013-02-01 12:40:16 -05:00
John Firebaugh
a78aeeb625 Merge controller into iD 2013-02-01 12:40:15 -05:00
John Firebaugh
7e68e8e114 Add iD.Context
This is a facade interface that ties together a bunch of
different internal objects and will make it easier to write
tests for behaviors, modes, and operations.
2013-02-01 12:40:15 -05:00
John Firebaugh
bbccec75be Convert Hash to a behavior 2013-01-31 18:28:24 -05:00
John Firebaugh
5f41b74955 Remove controller.exit 2013-01-31 16:00:02 -05:00
John Firebaugh
7ea7326f92 Extract Select behavior 2013-01-31 15:56:24 -05:00
John Firebaugh
402a9424c0 Make selection an array of entity IDs
Should have no visible effect yet.
2013-01-31 13:51:12 -05:00
John Firebaugh
6f7079d11c AddWay/AddNode -> AddEntity 2013-01-31 12:06:21 -05:00
John Firebaugh
1bfe1359ec AddWayNode -> AddVertex 2013-01-31 12:06:21 -05:00
John Firebaugh
7e8126ded9 I18n for modes and operations 2013-01-31 11:20:41 -05:00
Saman Bemel-Benrud
1b495870c0 grammar for tooltips, keybinding hints, other tooltip fixes. 2013-01-30 19:09:10 -05:00
John Firebaugh
e4c513ae87 midpoint = true -> type = 'midpoint'
Makes it more consistent with entities.
2013-01-30 16:24:33 -05:00
John Firebaugh
363cd53af1 Rearrange code 2013-01-30 16:17:30 -05:00
John Firebaugh
168a3b5e26 Fix drawing on midpoints (fixes #559) 2013-01-30 16:14:29 -05:00
John Firebaugh
dbac370c71 More draw refactoring 2013-01-30 16:14:29 -05:00