combodate options via data attribute, fixes

This commit is contained in:
vitalets
2013-03-06 21:36:31 +04:00
parent 3270e5e4b7
commit 7533a0cc72
3 changed files with 18 additions and 0 deletions
CHANGELOG.txt
src/inputs/combodate
test/unit

@ -48,6 +48,9 @@ $(function(){
this.options.viewformat = this.options.format;
}
//try parse combodate config defined as json string in data-combodate
options.combodate = $.fn.editableutils.tryParseJson(options.combodate, true);
//overriding combodate config (as by default jQuery extend() is not recursive)
this.options.combodate = $.extend({}, Constructor.defaults.combodate, options.combodate, {
format: this.options.format,