Skip to content

Commit 760e979

Browse files
Standardize the Error Message
Standardize the Error Message
1 parent be86719 commit 760e979

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

MerlinAU.asp

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -353,19 +353,17 @@ function ParseTimeHHMM(v){
353353
function ValidateHHMMUsingFwScheduleTime(hhmm){
354354
var v = (hhmm || '').trim();
355355
var parts = v.split(':');
356+
// One unified message for ANY invalid time input
357+
var commonMsg = fwScheduleTime.ErrorMsgHOUR() + '\n' + fwScheduleTime.ErrorMsgMINS();
358+
356359
if (parts.length !== 2){
357-
return {
358-
ok: false,
359-
msg: fwScheduleTime.ErrorMsgHOUR() + '\n' + fwScheduleTime.ErrorMsgMINS()
360-
};
360+
return { ok: false, msg: commonMsg };
361361
}
362362
var H = parts[0], M = parts[1];
363363
var hOk = fwScheduleTime.ValidateHOUR(H);
364364
var mOk = fwScheduleTime.ValidateMINS(M);
365-
var msg = '';
366-
if (!hOk) msg += fwScheduleTime.ErrorMsgHOUR();
367-
if (!mOk) msg += (msg ? '\n' : '') + fwScheduleTime.ErrorMsgMINS();
368-
return { ok: (hOk && mOk), msg: msg };
365+
// Always return the same message when invalid; no hour/minute-specific messaging
366+
return { ok: (hOk && mOk), msg: (hOk && mOk) ? '' : commonMsg };
369367
}
370368
371369
function MarkTimePickerInvalid(T, msg){

0 commit comments

Comments
 (0)