Permalink
Browse files

Fixed data series to work in jQuery noConflict mode

  • Loading branch information...
1 parent 7ad4e50 commit 3666725d8d17edfd65ab032e228e4574903eec47 @bjornd committed Oct 7, 2012
Showing with 3 additions and 5 deletions.
  1. +3 −5 lib/data-series.js
View
@@ -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(){

0 comments on commit 3666725

Please sign in to comment.