Permalink
Browse files

Merge branch 'release/1.1.1'

  • Loading branch information...
2 parents ab6e73f + 686c6c3 commit 341a053d9e272f8331bb51ef4565060cbda00e9e @bjornd committed Oct 7, 2012
Showing with 6 additions and 7 deletions.
  1. +1 −1 converter/converter.py
  2. +1 −1 jquery-jvectormap.js
  3. +3 −5 lib/data-series.js
  4. +1 −0 lib/world-map.js
View
2 converter/converter.py
@@ -1,5 +1,5 @@
#
-# jVectorMap version 1.1
+# jVectorMap version 1.1.1
#
# Copyright 2011-2012, Kirill Lebedev
# Licensed under the MIT license.
View
2 jquery-jvectormap.js
@@ -1,5 +1,5 @@
/**
- * jVectorMap version 1.1
+ * jVectorMap version 1.1.1
*
* Copyright 2011-2012, Kirill Lebedev
* Licensed under the MIT license.
View
8 lib/data-series.js
@@ -31,10 +31,8 @@ jvm.DataSeries = function(params, elements) {
this.scale = new jvm.SimpleScale(params.scale);
}
- if (params.values) {
- this.values = params.values || {};
- this.setValues(params.values);
- }
+ this.values = params.values || {};
+ this.setValues(this.values);
};
jvm.DataSeries.prototype = {
@@ -101,7 +99,7 @@ jvm.DataSeries.prototype = {
}
this.setAttributes(attrs);
- $.extend(this.values, values);
+ jvm.$.extend(this.values, values);
},
clear: function(){
View
1 lib/world-map.js
@@ -504,6 +504,7 @@ jvm.WorldMap.prototype = {
true
);
} else {
+ scale = scale * this.baseScale;
this.setScale(scale, - centerX * this.defaultWidth, - centerY * this.defaultHeight, true);
}
},

0 comments on commit 341a053

Please sign in to comment.