Update to 2.3.0

shekibobo · Aug 1, 2014 · fb48daa · fb48daa
1 parent db46ea2
commit fb48daa
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 17 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.2.9
+ * @preserve jQuery DateTimePicker plugin v2.3.0
  * @homepage http://xdsoft.net/jqplugins/datetimepicker/
  * (c) 2014, Chupurnov Valeriy.
  */
@@ -151,6 +151,14 @@
 					"Søn", "Man", "Tir", "ons", "Tor", "Fre", "lør"
 				]
 			},
+			no:{ // Norwegian
+				months: [
+					"Januar", "Februar", "Mars", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Desember"
+				],
+				dayOfWeek: [
+					"Søn", "Man", "Tir", "Ons", "Tor", "Fre", "Lør"
+				]
+			},
 			ja:{ // Japanese
 				months: [
 					"1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"
@@ -182,6 +190,14 @@
 				dayOfWeek: [
 					"Ne", "Po", "Út", "St", "Čt", "Pá", "So"
 				]
+			},
+			hu:{ // Hungarian
+			    months: [
+					"Január", "Február", "Március", "Április", "Május", "Június", "Július", "Augusztus", "Szeptember", "Október", "November", "December"
+			    ],
+			    dayOfWeek: [
+					"Va", "Hé", "Ke", "Sze", "Cs", "Pé", "Szo"
+			    ]
 			}
 		},
 		value:'',
@@ -256,7 +272,8 @@
 		className:'',
 
 		weekends	: 	[],
-		yearOffset:0
+		yearOffset:0,
+		beforeShowDay: null
 	};
 
 	// fix for ie8
@@ -361,6 +378,7 @@
 						timeboxparent.trigger('scroll_element.xdsoft_scroller',[(top-(coord.y-start.y))/(height-parentHeight)]);
 						event.stopPropagation();
 						event.preventDefault();
+						start = pointerEventToXY(event);
 					}
 				});
 				timeboxparent.on('touchend touchcancel',function( event ) {
@@ -517,7 +535,7 @@
 						datepicker.addClass('active');
 					else
 						datepicker.removeClass('active');
-						
+
 					if( options.timepicker )
 						timepicker.addClass('active');
 					else
@@ -776,6 +794,9 @@
 					};
 
 					_this.strToDateTime = function( sDateTime ) {
+						if( sDateTime && sDateTime instanceof Date && _this.isValidDate(sDateTime) )
+							return sDateTime;
+
 						var tmpDate = [],timeOffset,currentTime;
 
 						if( ( tmpDate = /^(\+|\-)(.*)$/.exec(sDateTime) )  && ( tmpDate[2]=Date.parseDate(tmpDate[2], options.formatDate) ) ) {
@@ -916,7 +937,7 @@
 									minDate = new Date(minDate.getFullYear(),minDate.getMonth(),minDate.getDate());
 								}
 
-								var d,y,m,classes = [];
+								var d,y,m,classes = [],customDateSettings;
 
 								while( i<_xdsoft_datetime.currentTime.countDaysInMonth()||start.getDay()!=options.dayOfWeekStart||_xdsoft_datetime.currentTime.getMonth()==start.getMonth() ) {
 									classes = [];
@@ -926,14 +947,22 @@
 
 									classes.push('xdsoft_date');
 
-									if( ( maxDate!==false && start > maxDate )||(  minDate!==false && start < minDate ) ){
+									if ( options.beforeShowDay && options.beforeShowDay.call ) {
+										customDateSettings = options.beforeShowDay.call(datetimepicker, start);
+									} else {
+										customDateSettings = null;
+									}
+
+									if( ( maxDate!==false && start > maxDate )||(  minDate!==false && start < minDate )||(customDateSettings && customDateSettings[0] === false) ){
 										classes.push('xdsoft_disabled');
 									}
 
-									if( _xdsoft_datetime.currentTime.getMonth()!=m ){
-										classes.push('xdsoft_other_month');
+									if ( customDateSettings && customDateSettings[1] != "" ) {
+										classes.push(customDateSettings[1]);
 									}
 
+									if( _xdsoft_datetime.currentTime.getMonth()!=m ) classes.push('xdsoft_other_month');
+
 									if( (options.defaultSelect||datetimepicker.data('changed')) && _xdsoft_datetime.currentTime.dateFormat( options.formatDate )==start.dateFormat( options.formatDate ) ) {
 										classes.push('xdsoft_current');
 									}
@@ -1237,16 +1266,23 @@
 				datetimepicker.setOptions(options);
 
 				function getCurrentValue(){
-					var ct = options.value?options.value:(input&&input.val&&input.val())?input.val():'';
-
-					if( ct && _xdsoft_datetime.isValidDate(ct = Date.parseDate(ct, options.format)) ) {
+
+					var ct = false;
+
+                    if (options.startDate instanceof Date && !isNaN(options.startDate.valueOf())) {
+                        ct = options.startDate;
+                    } else if (!ct && options.startDate!==false) {
+                        ct = _xdsoft_datetime.strToDateTime(options.startDate);
+                    } else if (!ct) {
+                        ct = options.value?options.value:(input&&input.val&&input.val())?input.val():'';
+				        ct = Date.parseDate(ct, options.format);
+                    }
+
+					if ( ct && _xdsoft_datetime.isValidDate(ct) ) {
 						datetimepicker.data('changed',true);
-					}else
-						ct = '';
-
-					if( !ct && options.startDate!==false ){
-						ct = _xdsoft_datetime.strToDateTime(options.startDate);
-					}
+					} else {
+                        ct = '';
+                    }
 
 					return ct?ct:0;
 				}

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