Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'hotfix/0.2.1'

  • Loading branch information...
commit 1d4537a091e792f9dccfe82c62de598d492f5252 2 parents 119df09 + 9990236
@bjornd authored
View
2  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.
View
6 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(){
View
2  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>
Please sign in to comment.
Something went wrong with that request. Please try again.