Update to 2.3.2

shekibobo · Aug 1, 2014 · 66fd81f · 66fd81f
1 parent 8ebc4a7
commit 66fd81f
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 15 deletions.
diff --git a/app/assets/javascripts/jquery.xdan.datetimepicker.js b/app/assets/javascripts/jquery.xdan.datetimepicker.js
@@ -1,5 +1,5 @@
 /**
- * @preserve jQuery DateTimePicker plugin v2.3.1
+ * @preserve jQuery DateTimePicker plugin v2.3.2
  * @homepage http://xdsoft.net/jqplugins/datetimepicker/
  * (c) 2014, Chupurnov Valeriy.
  */
@@ -217,7 +217,10 @@
 
 		timepicker:true,
 		datepicker:true,
-
+
+		defaultTime:false,		// use formatTime format (ex. '10:00' for formatTime:	'H:i')
+		defaultDate:false, 		// use formatDate format (ex new Date() or '1986/12/08' or '-1970/01/05' or '-1970/01/05')
+
 		minDate:false,
 		maxDate:false,
 		minTime:false,
@@ -730,21 +733,37 @@
 
 				var _xdsoft_datetime = new function() {
 					var _this = this;
-					_this.now = function() {
+					_this.now = function( norecursion ) {
 						var d = new Date();
-						if( options.yearOffset )
+
+						if( !norecursion && options.defaultDate  ){
+							var date = _this.strtodate(options.defaultDate);
+							d.setFullYear( date.getFullYear() );
+							d.setMonth( date.getMonth() );
+							d.setDate( date.getDate() );
+						}
+
+						if( options.yearOffset  ){
 							d.setFullYear(d.getFullYear()+options.yearOffset);
+						}
+
+						if( !norecursion && options.defaultTime ){
+							var time = _this.strtotime(options.defaultTime);
+							d.setHours( time.getHours() );
+							d.setMinutes( time.getMinutes() );
+						}
+
 						return d;
 					};
 
-					_this.currentTime = this.now();
+
 					_this.isValidDate = function (d) {
 						if ( Object.prototype.toString.call(d) !== "[object Date]" )
 							return false;
 						return !isNaN(d.getTime());
 					};
 
-					_this.setCurrentTime = function( dTime) {
+					_this.setCurrentTime = function( dTime ) {
 						_this.currentTime = (typeof dTime == 'string')? _this.strToDateTime(dTime) : _this.isValidDate(dTime) ? dTime: _this.now();
 						datetimepicker.trigger('xchange.xdsoft');
 					};
@@ -815,9 +834,9 @@
 						if( sDate && sDate instanceof Date && _this.isValidDate(sDate) )
 							return sDate;
 
-						var currentTime = sDate?Date.parseDate(sDate, options.formatDate):_this.now();
+						var currentTime = sDate?Date.parseDate(sDate, options.formatDate):_this.now(true);
 						if( !_this.isValidDate(currentTime) )
-							currentTime = _this.now();
+							currentTime = _this.now(true);
 
 						return currentTime;
 					};
@@ -828,14 +847,16 @@
 
 						var currentTime = sTime?Date.parseDate(sTime, options.formatTime):_this.now();
 						if( !_this.isValidDate(currentTime) )
-							currentTime = _this.now();
+							currentTime = _this.now(true);
 
 						return currentTime;
 					};
 
 					_this.str = function() {
 						return _this.currentTime.dateFormat(options.format);
 					};
+
+					_this.currentTime = this.now();
 				};
 				mounth_picker
 					.find('.xdsoft_today_button')
@@ -1281,11 +1302,9 @@
 
 					var ct = false;
 
-                    if (options.startDate instanceof Date && !isNaN(options.startDate.valueOf())) {
-                        ct = options.startDate;
-                    } else if (!ct && options.startDate!==false) {
+                    if ( options.startDate ) {
                         ct = _xdsoft_datetime.strToDateTime(options.startDate);
-                    } else if (!ct) {
+                    } else {
                         ct = options.value?options.value:(input&&input.val&&input.val())?input.val():'';
 				        ct = Date.parseDate(ct, options.format);
                     }
@@ -1298,7 +1317,7 @@
 
 					return ct?ct:0;
 				}
-
+				//debugger
 				_xdsoft_datetime.setCurrentTime( getCurrentValue() );
 
 				input

diff --git a/lib/xdan-datetimepicker-rails/version.rb b/lib/xdan-datetimepicker-rails/version.rb
@@ -1,3 +1,3 @@
 module XdanDatetimepickerRails
-  VERSION = '2.3.1'
+  VERSION = '2.3.2'
 end