Improve Calendar form field style

joomla · Jun 13, 2023 · 7eb2847 · 7eb2847
1 parent f828378
commit 7eb2847
Showing 1 changed file with 18 additions and 20 deletions.
diff --git a/build/media_source/system/js/fields/calendar.es5.js b/build/media_source/system/js/fields/calendar.es5.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
+ * @copyright  (C) 2016-2023 Open Source Matters, Inc. <https://www.joomla.org>
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 !(function(window, document){
@@ -126,11 +126,11 @@
 
 		// Evaluate the min year
 		if (btn.dataset.minYear) {
-			self.params.minYear = getBoundary(parseInt(btn.dataset.minYear, 10), self.params.dateType);
+			self.params.minYear = parseInt(btn.dataset.minYear, 10);
 		}
 		// Evaluate the max year
 		if (btn.dataset.maxYear) {
-			self.params.maxYear = getBoundary(parseInt(btn.dataset.maxYear, 10), self.params.dateType);
+			self.params.maxYear = parseInt(btn.dataset.maxYear, 10);
 		}
 		// Evaluate the weekend days
 		if (btn.dataset.weekend) {
@@ -630,15 +630,15 @@
 			row.className = "calendar-head-row";
 			this._nav_py = hh("&lsaquo;", 1, -2, '', {"text-align": "center", "font-size": "18px", "line-height": "18px"}, 'js-btn btn-prev-year');                   // Previous year button
 			this.title = hh('<div style="text-align:center;font-size:18px"><span></span></div>', this.params.weekNumbers ? 6 : 5, 300);
-			this.title.className = "title";
+			this.title.className = "title title-year";
 			this._nav_ny = hh(" &rsaquo;", 1, 2, '', {"text-align": "center", "font-size": "18px", "line-height": "18px"}, 'js-btn btn-next-year');                   // Next year button
 		}
 
 		row = createElement("tr", thead);                                                                   // Head - month
 		row.className = "calendar-head-row";
 		this._nav_pm = hh("&lsaquo;", 1, -1, '', {"text-align": "center", "font-size": "2em", "line-height": "1em"}, 'js-btn btn-prev-month');                       // Previous month button
 		this._nav_month = hh('<div style="text-align:center;font-size:1.2em"><span></span></div>', this.params.weekNumbers ? 6 : 5, 888, 'td', {'textAlign': 'center'});
-		this._nav_month.className = "title";
+		this._nav_month.className = "title title-month";
 		this._nav_nm = hh(" &rsaquo;", 1, 1, '', {"text-align": "center", "font-size": "2em", "line-height": "1em"}, 'js-btn btn-next-month');                       // Next month button
 
 		row = createElement("tr", thead);                                                                   // day names
@@ -696,19 +696,19 @@
 			row = createElement("tr", tbody);
 			row.className = "time";
 
-			cell = createElement("td", row);
+			var cell = createElement("td", row);
 			cell.className = "time time-title";
 			cell.colSpan = 1;
 			cell.style.verticalAlign = 'middle';
 			cell.innerHTML = " ";
 
 			var cell1 = createElement("td", row);
 			cell1.className = "time hours-select";
-			cell1.colSpan = 2;
+			cell1.colSpan = self.params.time24 ? 3 : 2;
 
 			var cell2 = createElement("td", row);
 			cell2.className = "time minutes-select";
-			cell2.colSpan = 2;
+			cell2.colSpan = self.params.time24 ? 3 : 2;
 
 			(function () {
 				function makeTimePart(className, selected, range_start, range_end, cellTml) {
@@ -748,11 +748,12 @@
 					M = makeTimePart("time time-minutes", mins, 0, 59, cell2),
 					AP = null;
 
-				cell = createElement("td", row);
-				cell.className = "time ampm-select";
-				cell.colSpan = self.params.weekNumbers ? 2 : 3;
 
 				if (t12) {
+					cell = createElement("td", row);
+					cell.className = "time ampm-select";
+					cell.colSpan = self.params.weekNumbers ? 3 : 2;
+
 					var selAttr = true,
 						altDate = Date.parseFieldDate(self.inputField.getAttribute('data-alt-value'), self.params.dateFormat, 'gregorian', self.strings);
 					pm = (altDate.getHours() >= 12);
@@ -770,9 +771,10 @@
 							event.target.parentNode.parentNode.childNodes[2].childNodes[0].value,
 							event.target.parentNode.parentNode.childNodes[3].childNodes[0].value);
 					}, false);
-				} else {
+				} else if (self.params.weekNumbers) {
+					cell = createElement("td", row);
 					cell.innerHTML = "&#160;";
-					cell.colSpan = self.params.weekNumbers ? 3 : 2;
+					cell.colSpan = 1;
 				}
 
 				H.addEventListener("change", function (event) {
@@ -1098,7 +1100,7 @@
 
 			for (var i = 0; i < elements.length; i++) {
 				var element  = elements[i],
-				    instance = element._joomlaCalendar;
+					instance = element._joomlaCalendar;
 
 				if (instance) {
 					instance.setAltValue();
@@ -1145,16 +1147,12 @@
 	document.addEventListener("joomla:updated", _initCalendars);
 
 		/** B/C related code
-		 *
-		 *  @deprecated   4.0 will be removed in 6.0
-		 *                Use JoomlaCalendar.init instead
+		 *  @deprecated 4.0.0
 		 */
 		window.Calendar = {};
 
 		/** B/C related code
-		 *
-		 *  @deprecated   4.0 will be removed in 6.0
-		 *                Use JoomlaCalendar.init instead
+		 *  @deprecated 4.0.0
 		 */
 		Calendar.setup = function(obj) {