Changeset 84885 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Jun 21, 2020 1:35:38 AM (4 years ago)

Author:

vboxsync

Message:

TestManager: Some date fixes in the VCS popups and xtracker hacks. bugref:9778

Location:

trunk/src/VBox/ValidationKit/testmanager/htdocs/js

Files:

• common.js (modified) (8 diffs)
• vcsrevisions.js (modified) (1 diff)

trunk/src/VBox/ValidationKit/testmanager/htdocs/js/common.js

@@ -234 +234 @@
             cMinTz = -cMinTz;
 
-        return new Date(oDate.getTime() + cMinTz * 60000);
+        return new Date(oDate.getTime() - cMinTz * 60000);
     }
     console.assert(false);
     return oDate;
+}
+
+/** 
+ * @param   oDate   Date object. 
+ */ 
+function formatTimeHHMM(oDate, fNbsp)
+{
+    var sTime = oDate.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit'} );
+    if (fNbsp === true)
+        sTime = sTime.replace(' ', '\u00a0');
+
+    /* Workaround for single digit hours in firefox with en_US (minutes works fine): */
+    var iHours = oDate.getHours();
+    if ((iHours % 12) < 10)
+    {
+        var ch1 = sTime.substr(0, 1);
+        var ch2 = sTime.substr(1, 1);
+        if (  ch1 == (iHours % 12).toString()
+            && !(ch2 >= '0' && ch2 <= '9'))
+            sTime = '0' + sTime;
+    }
+    return sTime;
 }
 
@@ -1027 +1049 @@
 function tooltipElementOnMouseEnter()
 {
-    console.log('tooltipElementOnMouseEnter: arguments.length='+arguments.length+' [0]='+arguments[0]);
-    console.log('ENT: currentTarget='+arguments[0].currentTarget+' id='+arguments[0].currentTarget.id+' class='+arguments[0].currentTarget.className);
+    /*console.log('tooltipElementOnMouseEnter: arguments.length='+arguments.length+' [0]='+arguments[0]);
+    console.log('ENT: currentTarget='+arguments[0].currentTarget+' id='+arguments[0].currentTarget.id+' class='+arguments[0].currentTarget.className); */
     tooltipResetShowTimer();
     tooltipResetHideTimer();
@@ -1045 +1067 @@
 {
     var oEvt = arguments[0];
-    console.log('tooltipElementOnMouseOut: arguments.length='+arguments.length+' [0]='+oEvt);
-    console.log('OUT: currentTarget='+oEvt.currentTarget+' id='+oEvt.currentTarget.id+' class='+oEvt.currentTarget.className);
+    /*console.log('tooltipElementOnMouseOut: arguments.length='+arguments.length+' [0]='+oEvt);
+    console.log('OUT: currentTarget='+oEvt.currentTarget+' id='+oEvt.currentTarget.id+' class='+oEvt.currentTarget.className);*/
 
     /* Ignore the event if leaving to a child element. */
@@ -1206 +1228 @@
 function svnHistoryTooltipNewOnReadState(oTooltip, oRestReq, oParent)
 {
-    console.log('svnHistoryTooltipNewOnReadState');
+    /*console.log('svnHistoryTooltipNewOnReadState: status=' + oRestReq.status + ' readyState=' + oRestReq.readyState);*/
+    if (oRestReq.readyState != oRestReq.DONE)
+    {
+        oTooltip.oInnerElm.innerHTML = '<p>Loading ...(' + oRestReq.readyState + ')</p>';
+        return true;
+    }
 
     /*
@@ -1268 +1295 @@
             sHtml += '<a href="' + oResp.sTracChangesetUrlFmt.replace('%(iRevision)s', oCommit.iRevision.toString());
             sHtml += '" target="_blank">';
-            sHtml += '<span class="tmvcstimeline-time">' + escapeElem(tsCreated.toLocaleTimeString()) + '</span>'
+            sHtml += '<span class="tmvcstimeline-time">' + escapeElem(formatTimeHHMM(tsCreated, true)) + '</span>'
             sHtml += ' Changeset <span class="tmvcstimeline-rev">[' + oCommit.iRevision + ']</span>';
             sHtml += ' by <span class="tmvcstimeline-author">' + escapeElem(oCommit.sAuthor) + '</span>';
@@ -1280 +1307 @@
     }
 
-    console.log('svnHistoryTooltipNewOnReadState: sHtml=' + sHtml);
+    /*console.log('svnHistoryTooltipNewOnReadState: sHtml=' + sHtml);*/
     oTooltip.oInnerElm.innerHTML = sHtml;
 
@@ -1419 +1446 @@
 
         var oTooltip = g_dTooltips[sKey];
-        console.log('svnHistoryTooltipNewDelayedShow: ' + sRepository + ' ' + oTooltip);
+        /*console.log('svnHistoryTooltipNewDelayedShow: ' + sRepository + ' ' + oTooltip);*/
         if (!oTooltip)
         {
@@ -1425 +1452 @@
              * Create a new tooltip element.
              */
-            console.log('creating ' + sKey);
+            /*console.log('creating ' + sKey);*/
 
             var oElm = document.createElement('div');

trunk/src/VBox/ValidationKit/testmanager/htdocs/js/vcsrevisions.js

@@ -40 +40 @@
 function vcsRevisionFormatTime(tsDate)
 {
-    var sRet = tsDate.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit'} );
-    return sRet.replace(' ', '\u00a0');
+    return formatTimeHHMM(tsDate, true /*fNbsp*/);
 }