Merge branch 'hotfix/0.2.1'

BenjaminBeck · May 18, 2012 · 1d4537a · 1d4537a
2 parents 119df09 + 9990236
commit 1d4537a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/converter/converter.py b/converter/converter.py
@@ -1,5 +1,5 @@
 #
-# jVectorMap version 0.2
+# jVectorMap version 0.2.1
 #
 # Copyright 2011-2012, Kirill Lebedev
 # Licensed under the MIT license.

diff --git a/jquery-jvectormap.js b/jquery-jvectormap.js
@@ -1,5 +1,5 @@
 /**
- * jVectorMap version 0.2
+ * jVectorMap version 0.2.1
  *
  * Copyright 2011-2012, Kirill Lebedev
  * Licensed under the MIT license.
@@ -589,7 +589,9 @@
 
       this.canvas.applyTransformParams(this.scale, this.transX, this.transY);
 
-      this.repositionMarkers();
+      if (this.markers) {
+        this.repositionMarkers();
+      }
     },
 
     makeDraggable: function(){

diff --git a/tests/world-map.html b/tests/world-map.html
@@ -8,7 +8,7 @@
   <script src="assets/jquery-jvectormap-world-en.js"></script>
   <script>
     $(function(){
-      $('#map').vectorMap({map: 'world_en', markers: []});
+      $('#map').vectorMap({map: 'world_en'});
     })
   </script>
 </head>