CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-02 01:13:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,135 Commits 2 Branches 0 Tags
728036be51ea227635f052d182dc5bdd4e4f4bb1
Commit Graph

5135 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Firebaugh
2e6c23d7ef Fix namespace 2013-01-22 14:58:51 -05:00
Ansis Brammanis
66c0a08d00 Merge remote-tracking branch 'systemed/master' into labels 
Conflicts:
	js/id/renderer/map.js
 2013-01-22 14:55:15 -05:00
John Firebaugh
814c3608db Hook into undos in a different way 
This way doesn't depend on details of keybindings and
the undo button.

Also, implement this in DrawArea mode.
 2013-01-22 14:55:08 -05:00
John Firebaugh
ff15aa8e7b Rewrite d3.keybinding 
A keybinding now represents a set of key commands that can
be unbound as a set. Multiple keybindings are possible, and,
providing a namespace is provided to the constructor, will
not conflict with each other.

Also, key combination strings such as ⌘+A are now supported.
 2013-01-22 14:55:08 -05:00
John Firebaugh
851eae68b8 Match terminology with ReverseWay action 2013-01-22 14:54:30 -05:00
Tom MacWright
6f73ae48d7 Fix global leak 2013-01-22 14:49:28 -05:00
Ansis Brammanis
2b7aa93096 Add classes to labels for styling 2013-01-22 14:47:50 -05:00
Tom MacWright
9a3d545f17 Do not focus text fields after initial placement 2013-01-22 14:42:21 -05:00
Tom MacWright
64445e50ac Slow and fast redraw 2013-01-22 14:17:27 -05:00
Ansis Brammanis
0249d6b3eb Try multiple line label positions 2013-01-22 14:04:19 -05:00
Ansis Brammanis
14272ef200 Add label_stack 2013-01-22 13:03:53 -05:00
Ansis Brammanis
079a456500 Add pathLength to utils 2013-01-22 12:35:15 -05:00
Tom MacWright
1373acc080 Merge pull request #460 from systemed/fast-zoom 
Fast zooming based on transforms.
 2013-01-22 09:26:35 -08:00
Tom MacWright
748b597c84 Fast zooming based on transforms. 
* Replaces the mouseup-tranformStart method with a redraw debouced by 1/5s
 2013-01-22 12:23:51 -05:00
Ansis Brammanis
00e5ca25ee Split up pathTransform 2013-01-22 12:03:23 -05:00
Saman Bemel-Benrud
0d86cd8990 remove ui hidiing. 2013-01-22 11:48:36 -05:00
Tom MacWright
5937258c24 Merge branch 'hash' 2013-01-22 11:19:33 -05:00
Tom MacWright
55346c4d33 Work around blur issue for #439 2013-01-22 11:19:09 -05:00
Ansis Brammanis
397372b505 start rearranging label code 2013-01-22 11:04:39 -05:00
Ansis Brammanis
9aa74c404d Add rtree.js 2013-01-22 11:01:46 -05:00
Tom MacWright
42f145a945 Merge pull request #457 from systemed/hash 
Hash
 2013-01-22 07:47:03 -08:00
Tom MacWright
d214c651f2 Fix tests for hash updates 2013-01-22 10:42:16 -05:00
Tom MacWright
38c02509ea Do not tolerate modifiers for action shortcuts. 
Tolerates id-equality for selecting features.
 2013-01-22 10:39:10 -05:00
Tom MacWright
3d90801e63 Add willselect to hash, works with non-line features. 2013-01-22 10:22:00 -05:00
John Firebaugh
2e14a6b4de Unbind ⌘-Z when exiting DrawLine (fixes #455) 2013-01-22 09:49:38 -05:00
Tom MacWright
16ba8af499 Fix tests for non-question hash 2013-01-22 09:48:30 -05:00
Tom MacWright
7cf234365e Non-overwriting hash, add hash in select mode. Needs code for dealing 
with hash.
 2013-01-22 09:41:29 -05:00
Tom MacWright
b3765a4467 Microbranching jshint stuff. 2013-01-22 09:35:34 -05:00
John Firebaugh
c05f3ea7f4 Don't fill multipolygon boundaries (fixes #426) 2013-01-21 20:32:56 -05:00
John Firebaugh
c8bee263e9 Split ways at T junctions (fixes #453) 2013-01-21 20:32:17 -05:00
Ansis Brammanis
71f6402df0 add very basic support for area labels 2013-01-20 22:46:30 -05:00
Ansis Brammanis
572c111bf1 Add polygonCentroid and polygon area to utils 2013-01-20 22:21:18 -05:00
Ansis Brammanis
0afb564435 Merge remote-tracking branch 'systemed/master' into labels 
Conflicts:
	js/id/svg/lines.js
	js/id/svg/surface.js
 2013-01-20 20:37:00 -05:00
Ansis Brammanis
5d283f0698 usecapture for stopping right click propagation 2013-01-20 19:27:20 -05:00
Ansis Brammanis
a97a4e4617 Fix redrawing shared vertices 2013-01-20 19:05:53 -05:00
saman bb
9c68c15c51 experiment with hiding UI during drawing. 2013-01-20 18:50:05 -05:00
saman bb
949263adfd make all icons dark. 2013-01-20 18:49:49 -05:00
saman bb
3e8780d466 making things consistent with new UI style. 2013-01-20 18:30:34 -05:00
saman bb
19c59236b9 copy adjustment on inspector confirm/close button 2013-01-20 16:12:06 -05:00
saman bb
2414da969c put tag editor form on grid. 2013-01-20 16:06:52 -05:00
John Firebaugh
4a084a8b89 Improve midpoints rendering 2013-01-20 12:01:19 -08:00
John Firebaugh
fce209131a Improve vertex rendering 2013-01-20 11:37:14 -08:00
John Firebaugh
33b1f4f23c Render more line features 2013-01-20 09:39:25 -08:00
John Firebaugh
57df1395a1 Merge pull request #446 from bdon/master 
various fixes, refactors
 2013-01-20 06:50:48 -08:00
Brandon Liu
ded802049a add history.numChanges method. 
Use hasChanges/numChanges to toggle Save button and show confirmation dialog when navigating away from page.
 2013-01-19 23:16:48 -08:00
Brandon Liu
d83ec7f1eb Create method history.hasChanges 2013-01-19 23:01:47 -08:00
Brandon Liu
3b722ed503 Properly refer to iD.ui.confirm 2013-01-19 23:01:47 -08:00
Brandon Liu
59d37125df make notice not a global var. 2013-01-19 23:01:47 -08:00
John Firebaugh
79801e57af More highway rendering improvements 2013-01-19 21:04:50 -08:00
Ansis Brammanis
28cea97019 fix regression, rename Apply to Close in inspector 2013-01-19 21:12:53 -05:00