From 46fa66bf8353a70c752031c41f5e69b23052e834 Mon Sep 17 00:00:00 2001 From: booo Date: Sat, 17 Nov 2012 13:35:29 +0100 Subject: [PATCH 1/4] Add build results to .gitignore file as well as tempory vim files. --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..29a743e3f --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +iD.js +iD.min.js +*~ +*.swp +*.swo From c336a90481e81da922ffb111e20e35fecaaf9a1a Mon Sep 17 00:00:00 2001 From: booo Date: Sat, 17 Nov 2012 13:48:04 +0100 Subject: [PATCH 2/4] Do not use the executable flag on images, text files and other docs. --- docs/coding_standards.txt | 0 icons/bus_stop.png | Bin icons/cafe.png | Bin icons/fast_food.png | Bin icons/fire_station.png | Bin icons/parking.png | Bin icons/post_box.png | Bin icons/recycling.png | Bin icons/restaurant.png | Bin icons/school.png | Bin icons/station.png | Bin icons/telephone.png | Bin index.html | 0 js/iD/Connection.js | 0 js/iD/renderer/Map.js | 0 15 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 docs/coding_standards.txt mode change 100755 => 100644 icons/bus_stop.png mode change 100755 => 100644 icons/cafe.png mode change 100755 => 100644 icons/fast_food.png mode change 100755 => 100644 icons/fire_station.png mode change 100755 => 100644 icons/parking.png mode change 100755 => 100644 icons/post_box.png mode change 100755 => 100644 icons/recycling.png mode change 100755 => 100644 icons/restaurant.png mode change 100755 => 100644 icons/school.png mode change 100755 => 100644 icons/station.png mode change 100755 => 100644 icons/telephone.png mode change 100755 => 100644 index.html mode change 100755 => 100644 js/iD/Connection.js mode change 100755 => 100644 js/iD/renderer/Map.js diff --git a/docs/coding_standards.txt b/docs/coding_standards.txt old mode 100755 new mode 100644 diff --git a/icons/bus_stop.png b/icons/bus_stop.png old mode 100755 new mode 100644 diff --git a/icons/cafe.png b/icons/cafe.png old mode 100755 new mode 100644 diff --git a/icons/fast_food.png b/icons/fast_food.png old mode 100755 new mode 100644 diff --git a/icons/fire_station.png b/icons/fire_station.png old mode 100755 new mode 100644 diff --git a/icons/parking.png b/icons/parking.png old mode 100755 new mode 100644 diff --git a/icons/post_box.png b/icons/post_box.png old mode 100755 new mode 100644 diff --git a/icons/recycling.png b/icons/recycling.png old mode 100755 new mode 100644 diff --git a/icons/restaurant.png b/icons/restaurant.png old mode 100755 new mode 100644 diff --git a/icons/school.png b/icons/school.png old mode 100755 new mode 100644 diff --git a/icons/station.png b/icons/station.png old mode 100755 new mode 100644 diff --git a/icons/telephone.png b/icons/telephone.png old mode 100755 new mode 100644 diff --git a/index.html b/index.html old mode 100755 new mode 100644 diff --git a/js/iD/Connection.js b/js/iD/Connection.js old mode 100755 new mode 100644 diff --git a/js/iD/renderer/Map.js b/js/iD/renderer/Map.js old mode 100755 new mode 100644 From 52bd9f528464016c6e17931fe6277d83a7376f97 Mon Sep 17 00:00:00 2001 From: booo Date: Sat, 17 Nov 2012 14:48:51 +0100 Subject: [PATCH 3/4] Fix xml format/export. Error in line 33 was: Uncaught TypeError: Cannot call method 'decode' of undefined --- js/iD/format/XML.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/iD/format/XML.js b/js/iD/format/XML.js index 24e3938b8..437c5e3ee 100644 --- 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: { From 8be07222da80e47e3f399f686b9535e4a50a57aa Mon Sep 17 00:00:00 2001 From: booo Date: Sat, 17 Nov 2012 15:27:10 +0100 Subject: [PATCH 4/4] Fix controller not defined bug. --- js/iD/controller/{controller.js => Controller.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename js/iD/controller/{controller.js => Controller.js} (100%) diff --git a/js/iD/controller/controller.js b/js/iD/controller/Controller.js similarity index 100% rename from js/iD/controller/controller.js rename to js/iD/controller/Controller.js