Commit bb539b27 authored by David Stutz's avatar David Stutz

Merge pull request #448 from Tyf0x/fix_#444

** Fixed regression on setOptions (#444) **
parents cfa64abf 770c4f42
...@@ -1170,7 +1170,7 @@ ...@@ -1170,7 +1170,7 @@
* @returns {Array} * @returns {Array}
*/ */
mergeOptions: function(options) { mergeOptions: function(options) {
return $.extend(true, {}, this.defaults, options); return $.extend(true, {}, 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