Merge branch 'master' into markercluster

Conflicts: src/view.map.js
2012-09-25 11:49:16 +01:00
parent 79c262e25b d5e36944d7
commit 2d26afb435
6 changed files with 28 additions and 17 deletions
--- a/test/view.map.test.js
+++ b/test/view.map.test.js
@@ -202,7 +202,7 @@ test('Popup - Custom', function () {
  assertPresent(popup);

  var text = popup.html();
-  ok((text.indexOf('<h3>3</h3>y: 6') != -1))
+  ok((text.indexOf('<h3>1</h3>y: 2') != -1))

  view.remove();
 });