Submitted options should over-ride configured.

HumbleSoftware · Apr 2, 2012 · 5ba81e7 · 5ba81e7
1 parent ac9a8e6
commit 5ba81e7
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/js/adapters/flotr/Child.js b/js/adapters/flotr/Child.js
@@ -30,8 +30,7 @@ Child.prototype = {
     data = data || o.data;
 
     if (flotr) {
-      flotr = Flotr.clone(flotr);
+      flotr = Flotr.merge(flotr, Flotr.clone(o));
-      flotr = Flotr.merge(o, flotr);
     } else {
       flotr = o;
     }