Commit c4365826 authored by David Stutz's avatar David Stutz

Merge pull request #229 from cedricdeschenes/mergeOptions

Fixes #228: added this.options in the mergeOptions .extend
parents 8ce6b52f 4177413e
......@@ -781,7 +781,7 @@
* @returns {Array}
*/
mergeOptions: function(options) {
return $.extend({}, this.defaults, options);
return $.extend({}, this.defaults, this.options, options);
},
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment