CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-12 16:52:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,273 Commits 2 Branches 0 Tags
develop
Commit Graph

16273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom MacWright
fb3fb4080b Merge branch 'master' of git://github.com/systemed/iD into tagging-merge 2012-10-17 20:35:18 -04:00
Tom MacWright
00e824434f Set CSS states for states 2012-10-17 17:09:16 -04:00
Tom MacWright
b1df87d5a0 Remove straggling dojo dependency in Node 2012-10-17 17:09:05 -04:00
Tom MacWright
26e0a1f56c Add toGeoJSON for nodes and ways 2012-10-17 16:49:43 -04:00
Tom MacWright
a3515e16ee Prevent text selection, tweak styles 2012-10-17 16:40:15 -04:00
Tom MacWright
f360ec0bc2 Support mousewheel and doubleclick zooming 2012-10-17 16:21:03 -04:00
Tom MacWright
dd2b3de15b Clean up way drawing code 2012-10-17 16:10:16 -04:00
Tom MacWright
69a1f5a9ef Fix tracing functionality 2012-10-17 15:40:50 -04:00
Tom MacWright
b0773a83da Fix comment 2012-10-17 15:17:11 -04:00
Tom MacWright
7becc2a376 Remove console logs 2012-10-17 15:15:50 -04:00
Tom MacWright
663f880f57 Create simple Taginfo wrapper, suggest tags with datalists, 
rework tag editor window stashing concept of presets for now.
 2012-10-17 14:34:34 -04:00
Tom MacWright
7e62af4344 Fix matchesTags to populate tag editor for elements that have it 2012-10-17 12:59:27 -04:00
Tom MacWright
6673a5710e Reformat ways.json as proper json 2012-10-17 12:44:58 -04:00
Richard Fairhurst
fe0a4cf470 Remove control character 2012-10-17 17:41:37 +01:00
Tom MacWright
5e28faa6a1 Merge branch 'tagging' into tagging-merge 
Conflicts:
	index.html
	js/iD/Controller.js
	js/iD/Entity.js
	js/iD/controller/edit/EditBaseState.js
 2012-10-17 12:29:28 -04:00
Richard Fairhurst
ef132584b1 Merge pull request #8 from tmcw/pure-models 
Pure models
 2012-10-17 09:04:08 -07:00
Tom MacWright
cd9ecc7a54 Update tests to pass 2012-10-17 11:43:39 -04:00
Tom MacWright
6c9bcbb995 Use HTML and CSS buttons instead of dojo widgets 2012-10-17 11:24:12 -04:00
Tom MacWright
a179eb2a26 Use an object with keys to keep track of tiles. 
instead of a multidimensional array. this simplifies code and boosts
performance upon dragging.
 2012-10-17 11:10:14 -04:00
Tom MacWright
65a2309252 Remove hashtable dependency 2012-10-16 23:36:54 -04:00
Tom MacWright
51bb2201aa Get Selection working again 2012-10-16 23:28:52 -04:00
Tom MacWright
20841f213b Remove dojo array dependence in Node 2012-10-16 23:14:33 -04:00
Tom MacWright
2f9d51734d Remove hashtable reliance in entity 2012-10-16 23:14:10 -04:00
Tom MacWright
ce1e476c19 Pare down gettersetters, use loadFromUrl in loadFromAPI 2012-10-16 20:59:01 -04:00
Tom MacWright
2b8b30ad1e Liberate Connection, use jQuery for ajax 2012-10-16 20:54:46 -04:00
Tom MacWright
6cbbba9f8c Fix white seams betweent tiles by making coordinates absolute 2012-10-16 18:17:51 -04:00
Tom MacWright
824b82bbe1 Fix display. This stuff now works. 2012-10-16 18:13:58 -04:00
Tom MacWright
9343719737 More cleanup 2012-10-16 18:08:12 -04:00
Tom MacWright
0a0b1749dc Move towards compatible with existing view/edit code. This throws no 
errors, but does not yet draw.
 2012-10-16 17:38:51 -04:00
Tom MacWright
64bc7d5ea5 Split and test relations 2012-10-16 16:54:12 -04:00
Tom MacWright
2c9b377b5e Split out and test Way 2012-10-16 16:40:54 -04:00
Tom MacWright
a9fa9daf1b Merge branch 'underscore' into pure-models 
Start testing.

Conflicts:
	js/iD/Connection.js
	js/iD/Node.js
 2012-10-16 16:30:16 -04:00
Tom MacWright
d98007da68 Commit work towards pure models. This commit is not stable. 2012-10-16 16:06:03 -04:00
Tom MacWright
d22b457816 Using underscore instead of dojo's array. 
underscore also handles the issue of a cross-browser .forEach, but
supports the rest of the functional toolkit, so allows us to express
stuff like tag filtering more efficiently. It's also a pretty
common ingredient in other JS code so should feel familiar to a bunch of
people.
 2012-10-16 15:15:51 -04:00
Richard Fairhurst
92d00f0401 Merge pull request #2 from tmcw/jshint-fixes 
JSHint Fixes. Fixes (mostly by hand) for JS style & syntax problems.
 2012-10-13 15:58:47 -07:00
Tom MacWright
59b27276fd JSHint Fixes. Fixes (mostly by hand) for JS style & syntax problems. 
Basically these are mainly == in 0/null comparisons (typecasting is
dangerous in js), mixed spaces/tabs (style/indentation), and trailing
commas (will break IE7).
 2012-10-13 14:44:37 -07:00
Richard Fairhurst
97902cdc86 Identify presets (using lovely Mapzen icons) 2012-10-13 11:35:34 -07:00
Richard Fairhurst
63f0eb7256 Merge branch 'master' of github.com:systemed/iD into tagging 2012-10-12 00:33:13 +01:00
Richard Fairhurst
50f7a5dcfc Tagging work in progress 2012-10-12 00:32:13 +01:00
Richard Fairhurst
263988ad93 Merge pull request #1 from rickogden/master 
Fixed: Widget Expanding on Repeated Clicking
 2012-07-23 07:27:32 -07:00
Rick Ogden
4a679b779f removed console.log 2012-07-23 15:14:33 +01:00
Rick Ogden
bbd5b44aab fixed widget expanding bug. 2012-07-23 14:58:35 +01:00
Richard Fairhurst
3744ca602d Increase div height 2012-07-13 09:17:01 +01:00
Richard Fairhurst
9c4d87393f Update readme 2012-07-12 23:27:30 +01:00
Richard Fairhurst
bd6c6cc3a0 Remove logging 2012-07-12 18:34:33 +01:00
Richard Fairhurst
2adf722945 Docs updated 2012-07-12 18:30:48 +01:00
Richard Fairhurst
4ea76f1d2e Documentation for styleparser 
(not quite complete but this is taken from P2 anyway)
 2012-07-12 17:44:40 +01:00
Richard Fairhurst
7c8275deaa UI element documentation 2012-07-12 17:24:31 +01:00
Richard Fairhurst
7b384081eb Remove orphaned include 2012-07-12 17:11:38 +01:00
Richard Fairhurst
39ed103137 shape.* ControllerState documentation 2012-07-12 17:08:42 +01:00