Skip to content

Commit

Permalink
Update to 2.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
shekibobo committed Aug 1, 2014
1 parent fb48daa commit 8ebc4a7
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
14 changes: 13 additions & 1 deletion app/assets/javascripts/jquery.xdan.datetimepicker.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @preserve jQuery DateTimePicker plugin v2.3.0
* @preserve jQuery DateTimePicker plugin v2.3.1
* @homepage http://xdsoft.net/jqplugins/datetimepicker/
* (c) 2014, Chupurnov Valeriy.
*/
Expand Down Expand Up @@ -1088,6 +1088,12 @@
timerclick++;
var $this = $(this),
currentTime = _xdsoft_datetime.currentTime;

if( currentTime===undefined||currentTime===null ){
_xdsoft_datetime.currentTime = _xdsoft_datetime.now();
currentTime = _xdsoft_datetime.currentTime;
}

if( $this.hasClass('xdsoft_disabled') )
return false;

Expand Down Expand Up @@ -1120,6 +1126,12 @@
xdevent.stopPropagation(); // NAJ: Prevents closing of Pop-ups, Modals and Flyouts
var $this = $(this),
currentTime = _xdsoft_datetime.currentTime;

if( currentTime===undefined||currentTime===null ){
_xdsoft_datetime.currentTime = _xdsoft_datetime.now();
currentTime = _xdsoft_datetime.currentTime;
}

if( $this.hasClass('xdsoft_disabled') )
return false;
currentTime.setHours($this.data('hour'));
Expand Down
2 changes: 1 addition & 1 deletion lib/xdan-datetimepicker-rails/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module XdanDatetimepickerRails
VERSION = '2.3.0'
VERSION = '2.3.1'
end

0 comments on commit 8ebc4a7

Please sign in to comment.