datatables.net-datetime 1.5.6 → 1.6.0

package/js/dataTables.dateTime.js

@@ -1,4 +1,4 @@
-/*! DateTime picker for DataTables.net v1.5.6
+/*! DateTime picker for DataTables.net v1.6.0
  *
  * © SpryMedia Ltd, all rights reserved.
  * License: MIT datatables.net/license/mit
@@ -6,7 +6,7 @@
 
 /**
  * @summary     DateTime picker for DataTables.net
- * @version     1.5.6
+ * @version     1.6.0
  * @file        dataTables.dateTime.js
  * @author      SpryMedia Ltd
  * @contact     www.datatables.net/contact
@@ -96,6 +96,7 @@ var DateTime = function (input, opts) {
 		'<div class="' + classPrefix + '-buttons">' +
 		'<a class="' + classPrefix + '-clear"></a>' +
 		'<a class="' + classPrefix + '-today"></a>' +
+		'<a class="' + classPrefix + '-selected"></a>' +
 		'</div>' +
 		'<div class="' + classPrefix + '-calendar"></div>' +
 		'</div>' +
@@ -118,6 +119,7 @@ var DateTime = function (input, opts) {
 		buttons: structure.find('.' + classPrefix + '-buttons'),
 		clear: structure.find('.' + classPrefix + '-clear'),
 		today: structure.find('.' + classPrefix + '-today'),
+		selected: structure.find('.' + classPrefix + '-selected'),
 		previous: structure.find('.' + classPrefix + '-iconLeft'),
 		next: structure.find('.' + classPrefix + '-iconRight'),
 		input: $(input)
@@ -137,7 +139,7 @@ var DateTime = function (input, opts) {
 		secondsRange: null,
 
 		/** @type {String} Unique namespace string for this instance */
-		namespace: 'dateime-' + (DateTime._instance++),
+		namespace: 'datetime-' + (DateTime._instance++),
 
 		/** @type {Object} Parts of the picker that should be shown */
 		parts: {
@@ -382,6 +384,10 @@ $.extend(DateTime.prototype, {
 			this.dom.today.css('display', 'none');
 		}
 
+		if (!this.c.buttons.selected) {
+			this.dom.selected.css('display', 'none');
+		}
+
 		// Render the options
 		this._optionsTitle();
 
@@ -394,7 +400,7 @@ $.extend(DateTime.prototype, {
 
 		// When attached to a hidden input, we always show the input picker, and
 		// do so inline
-		if (this.dom.input.attr('type') === 'hidden') {
+		if (this.dom.input.attr('type') === 'hidden' || this.c.alwaysVisible) {
 			this.dom.container.addClass('inline');
 			this.c.attachTo = 'input';
 
@@ -418,15 +424,14 @@ $.extend(DateTime.prototype, {
 				}
 
 				// In case the value has changed by text
-				that.val(that.dom.input.val(), false);
+				last = that.dom.input.val();
+				that.val(last, false);
 
 				that._show();
 			})
 			.on('keyup.datetime', function () {
 				// Update the calendar's displayed value as the user types
-				if (that.dom.container.is(':visible')) {
-					that.val(that.dom.input.val(), false);
-				}
+				that.val(that.dom.input.val(), false);
 			});
 
 		// Want to prevent the focus bubbling up the document to account for
@@ -531,6 +536,13 @@ $.extend(DateTime.prototype, {
 						// containing today
 						that.s.display = new Date();
 
+						that._setTitle();
+						that._setCalander();
+					}
+					else if ($(target).hasClass(classPrefix + '-selected')) {
+						// Don't change the value, but jump to where the selected value is
+						that.s.display = new Date(that.s.d.getTime());
+
 						that._setTitle();
 						that._setCalander();
 					}
@@ -824,7 +836,7 @@ $.extend(DateTime.prototype, {
 	 * @private
 	 */
 	_hide: function (destroy) {
-		if (!destroy && this.dom.input.attr('type') === 'hidden') {
+		if (!destroy && (this.dom.input.attr('type') === 'hidden' || this.c.alwaysVisible)) {
 			return;
 		}
 
@@ -833,10 +845,12 @@ $.extend(DateTime.prototype, {
 		this.dom.container.detach();
 
 		$(window).off('.' + namespace);
-		$(document).off('keydown.' + namespace);
+		$(document)
+			.off('keydown.' + namespace)
+			.off('keyup.' + namespace)
+			.off('click.' + namespace);
 		$('div.dataTables_scrollBody').off('scroll.' + namespace);
 		$('div.DTE_Body_Content').off('scroll.' + namespace);
-		$(document).off('click.' + namespace);
 		$(this.dom.input[0].offsetParent).off('.' + namespace);
 	},
 
@@ -1301,6 +1315,7 @@ $.extend(DateTime.prototype, {
 
 		// Set the language strings in case any have changed
 		this.dom.today.text(i18n.today).text(i18n.today);
+		this.dom.selected.text(i18n.selected).text(i18n.selected);
 		this.dom.clear.text(i18n.clear).text(i18n.clear);
 		this.dom.previous
 			.attr('title', i18n.previous)
@@ -1524,14 +1539,24 @@ $.extend(DateTime.prototype, {
 		// in the date picker - this might need to be changed).
 		$(document).on('keydown.' + namespace, function (e) {
 			if (
-				e.keyCode === 9 || // tab
-				e.keyCode === 27 || // esc
-				e.keyCode === 13    // return
+				that.dom.container.is(':visible') && (
+					e.keyCode === 9 || // tab
+					e.keyCode === 13    // return
+				)
 			) {
 				that._hide();
 			}
 		});
 
+		// Esc is on keyup to allow Editor to know that the container was hidden and thus
+		// not act on the esc itself.
+		$(document).on('keyup.' + namespace, function (e) {
+			if (that.dom.container.is(':visible') && e.keyCode === 27 ) { // esc
+				e.preventDefault();
+				that._hide();
+			}
+		});
+
 		clearTimeout(this.s.showTo);
 
 		// We can't use blur to hide, as we want to keep the picker open while
@@ -1629,10 +1654,13 @@ DateTime.type = 'DateTime';
  * @type {Object}
  */
 DateTime.defaults = {
+	alwaysVisible: false,
+
 	attachTo: 'body',
 
 	buttons: {
 		clear: false,
+		selected: false,
 		today: false
 	},
 
@@ -1660,7 +1688,8 @@ DateTime.defaults = {
 		minutes: 'Minute',
 		seconds: 'Second',
 		unknown: '-',
-		today: 'Today'
+		today: 'Today',
+		selected: 'Selected'
 	},
 
 	maxDate: null,
@@ -1688,7 +1717,7 @@ DateTime.defaults = {
 	yearRange: 25
 };
 
-DateTime.version = '1.5.6';
+DateTime.version = '1.6.0';
 
 /**
  * CommonJS factory function pass through. Matches DataTables.

package/nuget.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>datatables.net-datetime</id>
-        <version>1.5.5</version>
+        <version>1.6.0</version>
         <description>DataTables date / time picker</description>
         <authors>SpryMedia Ltd</authors>
         <projectUrl>http://datatables.net</projectUrl>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datatables.net-datetime",
-  "version": "1.5.6",
+  "version": "1.6.0",
   "description": "DateTime picker for DataTables.net",
   "main": "dist/dataTables.dateTime.js",
   "module": "dist/dataTables.dateTime.mjs",

package/test/options/dateTime.onChange.js

@@ -63,30 +63,30 @@ describe('dateTime - options - onChange', function () {
 			$('#test').click();
 			expect(count).toBe(0);
 		});
-		it('... triggers on date', function () {
+		it('... does not trigger on selected date', function () {
 			$('#test').click();
 			$('.dt-datetime-calendar .selected button span').click();
-			expect(count).toBe(1);
+			expect(count).toBe(0);
 		});
 		it('... does not trigger again if no change', function () {
 			$('#test').click();
 			$('.dt-datetime-calendar .selected button span').click();
-			expect(count).toBe(1);
+			expect(count).toBe(0);
 		});
 		it('... triggers on hours', function () {
 			$('#test').click();
 			$('.dt-datetime-hours tbody tr:eq(0) td:eq(0) button span').click();
-			expect(count).toBe(2);
+			expect(count).toBe(1);
 		});
 		it('... triggers on minutes', function () {
 			$('#test').click();
 			$('.dt-datetime-minutes tbody tr:eq(0) td:eq(0) button span').click();
-			expect(count).toBe(3);
+			expect(count).toBe(2);
 		});
 		it('... triggers on seconds', function () {
 			$('#test').click();
 			$('.dt-datetime-seconds tbody tr:eq(0) td:eq(0) button span').click();
-			expect(count).toBe(4);
+			expect(count).toBe(3);
 		});
 
 		dt.html('input');