xdan-datetimepicker-rails 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6832de300b368615a049e6e1e57462ac42ed11f5
-  data.tar.gz: ff3f16180853551486fddb63359039a96974ea4a
+  metadata.gz: fb3ff2ef786152c733ee11b40ae2e28bcd8fed52
+  data.tar.gz: 2f115008386c18b1e1cd887e2234876c84eeb494
 SHA512:
-  metadata.gz: 9a9a7f340229a1f1b54375a97ad6f3c2dc08cb4a0d8245dbee9f58fd558377b61d7c8faf647d788db68345e2826f70f8de086c67689d28b2737c693c618dae1c
-  data.tar.gz: 129cf6d773a19ad54e8c9c502abf8e6867de5c4e1c8b23068f3bb4dcbe05cab02b0cdb761923a1b4976c12d402c90f9c3b2e1bc7951a99267c4dd3756713987f
+  metadata.gz: 4e59ef21760bceef040114fca198eab8edb924c180bbf8d8c87dff9b72809bc71bbb2a370e20c5e75191170581f71e01844f84487eb46689434258beee11c5d3
+  data.tar.gz: 26ec39e4f2979995c577472e460aacb5f320dd029854ad8e428af4d8fffbb60a7b3133d7a467568616b6f99a9dd41416ac6e5a995b40d6cef12b7b054fa2d1ef

data/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,7 +847,7 @@
 							
 						var currentTime = sTime?Date.parseDate(sTime, options.formatTime):_this.now();
 						if( !_this.isValidDate(currentTime) )
-							currentTime = _this.now();
+							currentTime = _this.now(true);
 							
 						return currentTime;
 					};
@@ -836,6 +855,8 @@
 					_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

data/lib/xdan-datetimepicker-rails/version.rb

@@ -1,3 +1,3 @@
 module XdanDatetimepickerRails
-  VERSION = '2.3.1'
+  VERSION = '2.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xdan-datetimepicker-rails
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Joshua Kovach