Permalink
Browse files

Submitted options should over-ride configured.

  • Loading branch information...
1 parent ac9a8e6 commit 5ba81e7422a643eea4094150f1b76b165385356e @cesutherland cesutherland committed Apr 2, 2012
Showing with 1 addition and 2 deletions.
  1. +1 −2 js/adapters/flotr/Child.js
@@ -30,8 +30,7 @@ Child.prototype = {
data = data || o.data;
if (flotr) {
- flotr = Flotr.clone(flotr);
- flotr = Flotr.merge(o, flotr);
+ flotr = Flotr.merge(flotr, Flotr.clone(o));
} else {
flotr = o;
}

0 comments on commit 5ba81e7

Please sign in to comment.