Allow time format to be overriden by data attribute (#1801)

* Allow for the `data-time` format to be overridden by `data-time-format` attribute.
* Closes #1776

CTFd/themes/admin/static/js/core.dev.js

@@ -116,7 +116,7 @@ eval("\n\nvar _q = _interopRequireDefault(__webpack_require__(/*! q */ \"./node_
 /***/ (function(module, exports, __webpack_require__) {
 
 ;
-eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n  value: true\n});\nexports[\"default\"] = void 0;\n\nvar _dayjs = _interopRequireDefault(__webpack_require__(/*! dayjs */ \"./node_modules/dayjs/dayjs.min.js\"));\n\nvar _advancedFormat = _interopRequireDefault(__webpack_require__(/*! dayjs/plugin/advancedFormat */ \"./node_modules/dayjs/plugin/advancedFormat.js\"));\n\nvar _jquery = _interopRequireDefault(__webpack_require__(/*! jquery */ \"./node_modules/jquery/dist/jquery.js\"));\n\nfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { \"default\": obj }; }\n\n_dayjs[\"default\"].extend(_advancedFormat[\"default\"]);\n\nvar _default = function _default() {\n  (0, _jquery[\"default\"])(\"[data-time]\").each(function (i, elem) {\n    var time = (0, _jquery[\"default\"])(elem).data(\"time\");\n    elem.innerText = (0, _dayjs[\"default\"])(time).format(\"MMMM Do, h:mm:ss A\");\n  });\n};\n\nexports[\"default\"] = _default;\n\n//# sourceURL=webpack:///./CTFd/themes/core/assets/js/times.js?");
+eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n  value: true\n});\nexports[\"default\"] = void 0;\n\nvar _dayjs = _interopRequireDefault(__webpack_require__(/*! dayjs */ \"./node_modules/dayjs/dayjs.min.js\"));\n\nvar _advancedFormat = _interopRequireDefault(__webpack_require__(/*! dayjs/plugin/advancedFormat */ \"./node_modules/dayjs/plugin/advancedFormat.js\"));\n\nvar _jquery = _interopRequireDefault(__webpack_require__(/*! jquery */ \"./node_modules/jquery/dist/jquery.js\"));\n\nfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { \"default\": obj }; }\n\n_dayjs[\"default\"].extend(_advancedFormat[\"default\"]);\n\nvar _default = function _default() {\n  (0, _jquery[\"default\"])(\"[data-time]\").each(function (i, elem) {\n    var $elem = (0, _jquery[\"default\"])(elem);\n    var time = $elem.data(\"time\");\n    var format = $elem.data(\"time-format\") || \"MMMM Do, h:mm:ss A\";\n    elem.innerText = (0, _dayjs[\"default\"])(time).format(format);\n  });\n};\n\nexports[\"default\"] = _default;\n\n//# sourceURL=webpack:///./CTFd/themes/core/assets/js/times.js?");
 
 /***/ }),
 

CTFd/themes/core/assets/js/times.js

@@ -6,7 +6,9 @@ dayjs.extend(advancedFormat);
 
 export default () => {
   $("[data-time]").each((i, elem) => {
-    let time = $(elem).data("time");
+    let $elem = $(elem);
-    elem.innerText = dayjs(time).format("MMMM Do, h:mm:ss A");
+    let time = $elem.data("time");
+    let format = $elem.data("time-format") || "MMMM Do, h:mm:ss A";
+    elem.innerText = dayjs(time).format(format);
   });
 };

CTFd/themes/core/static/js/core.dev.js

@@ -116,7 +116,7 @@ eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n  value: true\n});\n
 /***/ (function(module, exports, __webpack_require__) {
 
 ;
-eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n  value: true\n});\nexports[\"default\"] = void 0;\n\nvar _dayjs = _interopRequireDefault(__webpack_require__(/*! dayjs */ \"./node_modules/dayjs/dayjs.min.js\"));\n\nvar _advancedFormat = _interopRequireDefault(__webpack_require__(/*! dayjs/plugin/advancedFormat */ \"./node_modules/dayjs/plugin/advancedFormat.js\"));\n\nvar _jquery = _interopRequireDefault(__webpack_require__(/*! jquery */ \"./node_modules/jquery/dist/jquery.js\"));\n\nfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { \"default\": obj }; }\n\n_dayjs[\"default\"].extend(_advancedFormat[\"default\"]);\n\nvar _default = function _default() {\n  (0, _jquery[\"default\"])(\"[data-time]\").each(function (i, elem) {\n    var time = (0, _jquery[\"default\"])(elem).data(\"time\");\n    elem.innerText = (0, _dayjs[\"default\"])(time).format(\"MMMM Do, h:mm:ss A\");\n  });\n};\n\nexports[\"default\"] = _default;\n\n//# sourceURL=webpack:///./CTFd/themes/core/assets/js/times.js?");
+eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n  value: true\n});\nexports[\"default\"] = void 0;\n\nvar _dayjs = _interopRequireDefault(__webpack_require__(/*! dayjs */ \"./node_modules/dayjs/dayjs.min.js\"));\n\nvar _advancedFormat = _interopRequireDefault(__webpack_require__(/*! dayjs/plugin/advancedFormat */ \"./node_modules/dayjs/plugin/advancedFormat.js\"));\n\nvar _jquery = _interopRequireDefault(__webpack_require__(/*! jquery */ \"./node_modules/jquery/dist/jquery.js\"));\n\nfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { \"default\": obj }; }\n\n_dayjs[\"default\"].extend(_advancedFormat[\"default\"]);\n\nvar _default = function _default() {\n  (0, _jquery[\"default\"])(\"[data-time]\").each(function (i, elem) {\n    var $elem = (0, _jquery[\"default\"])(elem);\n    var time = $elem.data(\"time\");\n    var format = $elem.data(\"time-format\") || \"MMMM Do, h:mm:ss A\";\n    elem.innerText = (0, _dayjs[\"default\"])(time).format(format);\n  });\n};\n\nexports[\"default\"] = _default;\n\n//# sourceURL=webpack:///./CTFd/themes/core/assets/js/times.js?");
 
 /***/ }),