datatables.net-datetime 1.1.2 → 1.2.0

package/docs/option/buttons.today.xml

@@ -9,7 +9,7 @@
 	</default>
 
 	<description>
-		When enabled, this option will cause DateTime to show a button (text set by `dt-init i18n.today`) which the end user can activate to shift the calendar view to show today's date.
+		When enabled, this option will cause DateTime to show a button (text set by `de-init i18n.today`) which the end user can activate to shift the calendar view to show today's date.
 
 		Note that the value of the field does not change when activating this button.
 	</description>

package/examples/initialisation/datetime.xml

@@ -7,7 +7,7 @@
 <![CDATA[
 
 $(document).ready(function() {
-    new DateTime(document.getElementById('test'), {
+    window.d = new DateTime(document.getElementById('test'), {
         format: 'D MMM YYYY HH:mm'
     });
 });

package/examples/initialisation/dayjs.xml

@@ -2,15 +2,17 @@
 <dt-example table-type="html" table-class="display nowrap" order="9">
 
 <css lib="datetime"/>
-<js lib="//cdnjs.cloudflare.com/ajax/libs/dayjs/1.8.17/dayjs.min.js"/>
-<js lib="//cdnjs.cloudflare.com/ajax/libs/dayjs/1.8.17/plugin/utc.js"/>
+<js lib="//cdnjs.cloudflare.com/ajax/libs/dayjs/1.11.5/dayjs.min.js"/>
+<js lib="//cdnjs.cloudflare.com/ajax/libs/dayjs/1.11.5/plugin/utc.js"/>
+<js lib="//cdnjs.cloudflare.com/ajax/libs/dayjs/1.11.5/plugin/customParseFormat.min.js"/>
 <js lib="jquery datetime">
 <![CDATA[
 
 dayjs.extend(dayjs_plugin_utc);
+dayjs.extend(dayjs_plugin_customParseFormat);
 
 $(document).ready(function() {
-    new DateTime(document.getElementById('test'), {
+    window.allan = new DateTime(document.getElementById('test'), {
         format: 'D/M/YYYY'
     });
 });
@@ -23,12 +25,12 @@ $(document).ready(function() {
 
 This example shows the date / time input with [DayJS](https://github.com/iamkun/dayjs) used to provide the date / time formatting.
 
-Please note that you also need the DayJS `UTC` plugin.
+Please note that you also need the DayJS `UTC` and `customParseFormat` plug-ins.
 
 ]]></info>
 
 <custom-table>
-    <input id="test" type="text" value="17/1/2020" />
+    <input id="test" type="text" value="17/1/2022" />
 </custom-table>
 
 </dt-example>

package/js/dataTables.dateTime.d.ts

@@ -1,53 +1,65 @@
+// Type definitions for DataTables DateTime
+//
+// Project: https://datatables.net/extensions/datetime
+// Definitions by:
+//   SpryMedia
 
-declare module 'datatables.net-datetime' {
-	interface IDateTimeOptions {
-		classPrefix?: string;
-		disableDays?: number[] | null;
-		firstDay?: number;
-		format?: string;
-		hoursAvailable?: number[] | null;
-		i18n?: {
-			previous?: string;
-			next?: string;
-			months?: string[];
-			weekdays?: string[];
-			amPm?: string[];
-			hours?: string;
-			minutes?: string;
-			seconds?: string;
-			unknown?: string;
-		};
-		maxDate?: Date | null;
-		minDate?: Date | null;
-		minutesAvailable?: number[] | null;
-		strict?: boolean;
-		locale?: string;
-		onChange?: (value: string, date: Date, el: HTMLElement) => void;
-		secondsAvailable?: number[] | null;
-		showWeekNumber?: boolean;
-		yearRange?: number;
-	}
+/// <reference types="jquery" />
 
-	class DateTime {
-		static use(moment: any); // Moment library
+interface IDateTimeOptions {
+	classPrefix?: string;
+	disableDays?: number[] | null;
+	firstDay?: number;
+	format?: string;
+	hoursAvailable?: number[] | null;
+	i18n?: {
+		previous?: string;
+		next?: string;
+		months?: string[];
+		weekdays?: string[];
+		amPm?: string[];
+		hours?: string;
+		minutes?: string;
+		seconds?: string;
+		unknown?: string;
+	};
+	maxDate?: Date | null;
+	minDate?: Date | null;
+	minutesAvailable?: number[] | null;
+	strict?: boolean;
+	locale?: string;
+	onChange?: (value: string, date: Date, el: HTMLElement) => void;
+	secondsAvailable?: number[] | null;
+	showWeekNumber?: boolean;
+	yearRange?: number;
+}
 
-		constructor(el: HTMLElement, opts?: IDateTimeOptions);
-		
-		destroy(): void;
-		errorMsg(): this;
-		errorMsg(message: string): this;
-		hide(): this;
-		max(max: Date): this;
-		main(min: Date): this;
-		owns(el: HTMLElement): boolean;
-		val(): Date;
-		val(set: string | Date): this;
-	}
+export class DateTime {
+	static use(moment: any); // Moment library
 
-	export = DateTime;
+	constructor(el: HTMLElement, opts?: IDateTimeOptions);
+	
+	destroy(): void;
+	errorMsg(): this;
+	errorMsg(message: string): this;
+	hide(): this;
+	max(max: Date): this;
+	main(min: Date): this;
+	owns(el: HTMLElement): boolean;
+	val(): Date;
+	val(set: string | Date): this;
+}
 
-	// jQuery interface additions
-	interface JQuery {
-		dtDateTime(opts?: IDateTimeOptions): JQuery;
+export default DateTime;
+
+// jQuery interface additions
+interface JQuery {
+	dtDateTime(opts?: IDateTimeOptions): JQuery;
+}
+
+// Also attached to DataTables object
+declare module 'datatables.net-datetime' {
+	interface ApiStatic {
+		DataTime: DateTime;
 	}
 }

package/js/dataTables.dateTime.js

@@ -1,4 +1,4 @@
-/*! DateTime picker for DataTables.net v1.1.2
+/*! DateTime picker for DataTables.net v1.2.0
  *
  * © SpryMedia Ltd, all rights reserved.
  * License: MIT datatables.net/license/mit
@@ -6,34 +6,11 @@
 
 /**
  * @summary     DateTime picker for DataTables.net
- * @version     1.1.2
+ * @version     1.2.0
  * @file        dataTables.dateTime.js
  * @author      SpryMedia Ltd
  * @contact     www.datatables.net/contact
  */
-(function( factory ){
-	if ( typeof define === 'function' && define.amd ) {
-		// AMD
-		define( ['jquery'], function ( $ ) {
-			return factory( $, window, document );
-		} );
-	}
-	else if ( typeof exports === 'object' ) {
-		// CommonJS
-		module.exports = function (root, $) {
-			if ( ! root ) {
-				root = window;
-			}
-
-			return factory( $, root, root.document );
-		};
-	}
-	else {
-		// Browser
-		factory( jQuery, window, document );
-	}
-}(function( $, window, document, undefined ) {
-'use strict';
 
 // Supported formatting and parsing libraries:
 // * Moment
@@ -268,7 +245,7 @@ $.extend( DateTime.prototype, {
 			this.s.d = null;
 		}
 		else if ( set === '--now' ) {
-			this.s.d = new Date();
+			this.s.d = this._dateToUtc(new Date());
 		}
 		else if ( typeof set === 'string' ) {
 			// luxon uses different method names so need to be able to call them
@@ -586,6 +563,7 @@ $.extend( DateTime.prototype, {
 								'setSeconds';
 
 						d[set]( val );
+						that._setCalander();
 						that._setTime();
 						that._writeOutput( true );
 						onChange();
@@ -619,6 +597,7 @@ $.extend( DateTime.prototype, {
 						}
 						else {
 							that._setCalander();
+							that._setTime();
 						}
 
 						onChange();
@@ -983,6 +962,13 @@ $.extend( DateTime.prototype, {
 	_needValue: function () {
 		if ( ! this.s.d ) {
 			this.s.d = this._dateToUtc( new Date() );
+
+			if (! this.s.parts.time) {
+				this.s.d.setUTCHours(0);
+				this.s.d.setUTCMinutes(0);
+				this.s.d.setSeconds(0);
+				this.s.d.setMilliseconds(0);
+			}
 		}
 
 		return this.s.d;
@@ -1077,7 +1063,7 @@ $.extend( DateTime.prototype, {
 				'selected' :
 				'';
 			
-			if (allowed && $.inArray(value, allowed) === -1) {
+			if (typeof value === 'number' && allowed && $.inArray(value, allowed) === -1) {
 				selected += ' disabled';
 			}
 
@@ -1137,9 +1123,11 @@ $.extend( DateTime.prototype, {
 			// Slight hack to allow for the different number of columns
 			a += '</tbody></thead><table class="'+className+' '+className+'-nospace"><tbody>';
 
-			var start = range !== null ?
-				range :
-				Math.floor( val / 10 )*10;
+			var start = range !== null
+				? range
+				: val === -1
+					? 0
+					: Math.floor( val / 10 )*10;
 
 			a += '<tr>';
 			for (j=start+1 ; j<start+10 ; j++ ) {
@@ -1327,7 +1315,7 @@ $.extend( DateTime.prototype, {
 			? luxDT.hour
 			: d
 				? d.getUTCHours()
-				: 0;
+				: -1;
 
 		var allowed = function ( prop ) { // Backwards compt with `Increment` option
 			return that.c[prop+'Available'] ?
@@ -1343,7 +1331,8 @@ $.extend( DateTime.prototype, {
 				? luxDT.minute
 				: d
 					? d.getUTCMinutes()
-					: 0, allowed('minutes'),
+					: -1,
+			allowed('minutes'),
 			this.s.minutesRange
 		);
 		this._optionsTime(
@@ -1353,7 +1342,7 @@ $.extend( DateTime.prototype, {
 				? luxDT.second
 				: d
 					? d.getSeconds()
-					: 0,
+					: -1,
 			allowed('seconds'),
 			this.s.secondsRange
 		);
@@ -1535,7 +1524,7 @@ DateTime.defaults = {
 	yearRange: 25
 };
 
-DateTime.version = '1.1.2';
+DateTime.version = '1.2.0';
 
 // Global export - if no conflicts
 if (! window.DateTime) {
@@ -1558,7 +1547,3 @@ if ($.fn.dataTable) {
 		$.fn.dataTable.Editor.DateTime = DateTime;
 	}
 }
-
-return DateTime;
-
-}));

package/make.sh

@@ -29,7 +29,7 @@ fi
 
 ./node_modules/gulp/bin/gulp.js
 
-js_compress dist/dataTables.dateTime.js
+js_wrap dist/dataTables.dateTime.js "jquery"
 css_compress dist/dataTables.dateTime.css
 
 if [ ! -d $OUT_DIR ]; then
@@ -39,6 +39,7 @@ if [ ! -d $OUT_DIR ]; then
 fi
 
 rsync -r dist/*.js $OUT_DIR/js
+rsync -r dist/*.mjs $OUT_DIR/js
 rsync -r dist/*.css $OUT_DIR/css
 
 # Copy and build examples

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "datatables.net-datetime",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "DateTime picker for DataTables.net",
   "main": "dist/dataTables.dateTime.js",
+  "module": "dist/dataTables.dateTime.mjs",
   "style": "dist/dataTables.dateTime.css",
   "types": "js/dataTables.dateTime.d.ts",
   "scripts": {