mirror of
https://github.com/xdan/datetimepicker.git
synced 2024-12-08 05:34:22 +00:00
new version 2.2.4
Fixed bug with setOptions allowTimes
This commit is contained in:
parent
ce4afc0061
commit
e54d6517b7
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name":"datetimepicker",
|
||||
"version":"2.2.3",
|
||||
"version":"2.2.4",
|
||||
"main": [
|
||||
"jquery.datetimepicker.js",
|
||||
"jquery.datetimepicker.css"
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "datetimepicker",
|
||||
"version": "2.2.3",
|
||||
"version": "2.2.4",
|
||||
"title": "jQuery Date and Time picker",
|
||||
"description": "jQuery plugin for date, time, or datetime manipulation in form",
|
||||
"keywords": [
|
||||
|
@ -1,5 +1,5 @@
|
||||
/**
|
||||
* @preserve jQuery DateTimePicker plugin v2.2.3
|
||||
* @preserve jQuery DateTimePicker plugin v2.2.4
|
||||
* @homepage http://xdsoft.net/jqplugins/datetimepicker/
|
||||
* (c) 2014, Chupurnov Valeriy.
|
||||
*/
|
||||
@ -428,6 +428,15 @@
|
||||
// set options
|
||||
datetimepicker.setOptions = function( _options ) {
|
||||
options = $.extend(true,{},options,_options);
|
||||
|
||||
if( _options.allowTimes && $.isArray(_options.allowTimes) && _options.allowTimes.length ){
|
||||
options['allowTimes'] = $.extend(true,[],_options.allowTimes);
|
||||
}
|
||||
|
||||
if( _options.weekends && $.isArray(_options.weekends) && _options.weekends.length ){
|
||||
options['weekends'] = $.extend(true,[],_options.weekends);
|
||||
}
|
||||
|
||||
if( (options.open||options.opened)&&(!options.inline) ) {
|
||||
input.trigger('open.xdsoft');
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user