Merge pull request #93 from booo/master

Fix a minor bug and add a gitignore file.
2026-02-13 01:02:58 +00:00 · 2012-11-17 07:20:50 -08:00
parent 1a68cab563 8be07222da
commit e6859e5cd8
18 changed files with 6 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,5 @@
+iD.js
+iD.min.js
+*~
+*.swp
+*.swo
--- a/docs/coding_standards.txt
+++ b/docs/coding_standards.txt
--- a/icons/bus_stop.png
+++ b/icons/bus_stop.png
--- a/icons/cafe.png
+++ b/icons/cafe.png
--- a/icons/fast_food.png
+++ b/icons/fast_food.png
--- a/icons/fire_station.png
+++ b/icons/fire_station.png
--- a/icons/parking.png
+++ b/icons/parking.png
--- a/icons/post_box.png
+++ b/icons/post_box.png
--- a/icons/recycling.png
+++ b/icons/recycling.png
--- a/icons/restaurant.png
+++ b/icons/restaurant.png
--- a/icons/school.png
+++ b/icons/school.png
--- a/icons/station.png
+++ b/icons/station.png
--- a/icons/telephone.png
+++ b/icons/telephone.png
--- a/index.html
+++ b/index.html
--- a/js/iD/Connection.js
+++ b/js/iD/Connection.js
--- a/js/iD/controller/Controller.js
+++ b/js/iD/controller/Controller.js
--- a/js/iD/format/XML.js
+++ b/js/iD/format/XML.js
@@ -30,7 +30,7 @@ iD.format.XML = {
            ));
        },
        way: function(entity) {
-            return iD.XML.decode(
+            return iD.format.XML.decode(
                (new XMLSerializer()).serializeToString(
                    JXON.unbuild({
                        way: {
--- a/js/iD/renderer/Map.js
+++ b/js/iD/renderer/Map.js