fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by ping
Commit d7755df424cb470701438d81bbb40cf056e7b5e0 2 parents d8b7d8b7 f90cb247

Merge branch 'portal_dev_4.9' into grey

Inline Side-by-side
Showing 1 changed file with 1 additions and 1 deletions
@@ -38,7 +38,7 @@ var jquery = require('jquery'); @@ -38,7 +38,7 @@ var jquery = require('jquery');
38 } 38 }
39 this.linkField = options.linkField || this.element.data('link-field') || false; 39 this.linkField = options.linkField || this.element.data('link-field') || false;
40 this.linkFormat = DPGlobal.parseFormat(options.linkFormat || this.element.data('link-format') || 'yyyy-mm-dd hh:ii:ss'); 40 this.linkFormat = DPGlobal.parseFormat(options.linkFormat || this.element.data('link-format') || 'yyyy-mm-dd hh:ii:ss');
41 - this.minuteStep = options.minuteStep || this.element.data('minute-step') || 5; 41 + this.minuteStep = options.minuteStep || this.element.data('minute-step') || 1;
42 this.pickerPosition = options.pickerPosition || this.element.data('picker-position') || 'bottom-right'; 42 this.pickerPosition = options.pickerPosition || this.element.data('picker-position') || 'bottom-right';
43 43
44 this._attachEvents(); 44 this._attachEvents();