fit-ui 3.2.10 → 3.2.12

package/dist/Fit.UI.js

@@ -682,7 +682,7 @@ Fit._internal =
 {
 	Core:
 	{
-		VersionInfo: { Major: 3, Minor: 2, Patch: 10 } // Do NOT modify format - version numbers are programmatically changed when releasing new versions - MUST be on a separate line!
+		VersionInfo: { Major: 3, Minor: 2, Patch: 12 } // Do NOT modify format - version numbers are programmatically changed when releasing new versions - MUST be on a separate line!
 	}
 };
 
@@ -11908,7 +11908,16 @@ Fit.Controls.Button = function(controlId)
 		Fit.Events.AddHandler(element, Fit.Browser.IsTouchEnabled() === true ? "touchend" : "click", function(e)
 		{
 			if (invokeClick === true && me.Enabled() === true)
+			{
+				// On computers the button would have gained focus by now, before triggering the OnClick callback,
+				// but not on touch devices, where the button receives focus after the OnTouchEnd event finishes.
+				// To ensure consistent behaviour across devices, we force focus the button on touch devices so that
+				// external code is able to determine focused state for the button, and return focus to the button later.
+				// See https://github.com/Jemt/Fit.UI/issues/214 for details.
+				me.Focused(true);
+
 				me.Click();
+			}
 
 			if (focusedBeforeClick !== null)
 			{
@@ -14059,11 +14068,21 @@ Fit.Controls.DatePicker = function(ctlId)
 		input.placeholder = getDatePlaceholder();
 		input.tabIndex = ((isMobile === true) ? -1 : 0);
 
-		// Prevent jQuery UI from focusing input field when calendar is opened (brings up virtual keyboard on touch devices).
+		// Prevent jQuery UI from focusing input field on touch devices when calendar is opened or when changing year/month (brings up virtual keyboard).
 		// https://github.com/Jemt/Fit.UI/blob/5e8f2183d75ae17ddb8086ebbe39025a7a7c98bb/Resources/JqueryUI-1.11.4.custom/jquery-ui.js#L1090
 		// => https://github.com/Jemt/Fit.UI/blob/5e8f2183d75ae17ddb8086ebbe39025a7a7c98bb/Resources/JqueryUI-1.11.4.custom/external/jquery/jquery.js#L5268
 		input._focus = input.focus;
-		input.focus = function() { console.debug("focus() disabled for this input field"); };
+		input.focus = function()
+		{
+			if (Fit.Device.OptimizeForTouch === true && me.TriggerIcon() === true)
+			{
+				icon.focus();
+			}
+			else
+			{
+				input._focus();
+			}
+		};
 
 		input.onkeydown = function(e)
 		{
@@ -14242,12 +14261,13 @@ Fit.Controls.DatePicker = function(ctlId)
 
 		icon = document.createElement("span");
 		icon.className = "fa fa-calendar";
+		icon.style.outline = "none"; // Avoid outline when focused
 		icon.tabIndex = -1;
 		icon.onclick = function(e)
 		{
 			me.Show();
 
-			if (me.TriggerIcon() === false) // Focus input if icon is hidden
+			if (me.TriggerIcon() === false) // Focus input if icon is hidden (using opacity:0)
 			{
 				input._focus();
 			}
@@ -14330,7 +14350,7 @@ Fit.Controls.DatePicker = function(ctlId)
 			}
 		}
 
-		var hasFocus = Fit.Array.Contains([input, inputTime, inputMobile, inputTimeMobile], Fit.Dom.GetFocused()) === true;
+		var hasFocus = Fit.Array.Contains([icon, input, inputTime, inputMobile, inputTimeMobile], Fit.Dom.GetFocused()) === true;
 
 		if (hasFocus === false && isMobile === false)
 		{
@@ -15287,16 +15307,18 @@ Fit.Controls.DatePicker = function(ctlId)
 			{
 				// Retain focus when changing month or year using calendar
 				// widget, which causes its DOM to be removed and replaced.
-				// Focus is later returned to DatePicker, but not in time for
+				// Focus is later returned to input field, but not in time for
 				// OnFocusOut. Related issue: https://github.com/Jemt/Fit.UI/issues/194
-				if (Fit.Device.OptimizeForTouch === true && me.TriggerIcon() === true)
+				// DISABLED: Logic moved to input.focus override.
+				/*if (Fit.Device.OptimizeForTouch === true && me.TriggerIcon() === true)
 				{
 					icon.focus(); // Focusing icon to prevent virtual keyboard from being shown on touch devices
 				}
 				else
 				{
 					input._focus(); // Do not use Focused(true) as it will not re-focus input, since control is already considered focused
-				}
+				}*/
+				input.focus();
 
 				if (open === true) // Remember which year and month the user navigated to
 				{
@@ -15314,14 +15336,16 @@ Fit.Controls.DatePicker = function(ctlId)
 			{
 				startDate = null;
 
-				if (Fit.Device.OptimizeForTouch === true && me.TriggerIcon() === true)
+				// DISABLED: Logic moved to input.focus override
+				/*if (Fit.Device.OptimizeForTouch === true && me.TriggerIcon() === true)
 				{
 					icon.focus(); // Focusing icon to prevent virtual keyboard from being shown on touch devices
 				}
 				else
 				{
 					input._focus(); // Do not use Focused(true) as it will not re-focus input, since control is already considered focused
-				}
+				}*/
+				input.focus();
 
 				input.onchange();
 			},
@@ -16045,6 +16069,25 @@ Fit.Controls.Dialog = function(controlId)
 				}
 			}
 		});
+
+		if (Fit.Browser.IsTouchEnabled() === true)
+		{
+			// Prevent invocation of OnMouseUp, OnMouseDown, and OnClick on elements behind the dialog
+			// on touch devices, if the dialog is disposed during invocation of OnTouchStart or OnTouchEnd.
+			// This will also prevent a UI control from receiving focus if positioned behind the dialog.
+			// See https://github.com/Jemt/Fit.UI/issues/215 for more information.
+
+			var stopEventIfDialogIsDisposed = function(e)
+			{
+				if (me === null)
+				{
+					Fit.Events.PreventDefault(e); // Dialog was disposed as a result of event - halt event
+				}
+			};
+
+			Fit.Events.AddHandler(me.GetDomElement(), "touchstart", stopEventIfDialogIsDisposed);
+			Fit.Events.AddHandler(me.GetDomElement(), "touchend", stopEventIfDialogIsDisposed);
+		}
 	}
 
 	// ============================================