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

Timestamp:

Mar 26, 2020 2:20:22 PM (5 years ago)

Author:

vboxsync

Message:

TestManager/vcstooltip: Don't specify a URL fragment because most browsers will scroll the main viewport/window. Firefox doesn't, but now I couldn't find a good way of changing the fragment without the iframe jumping around. Sigh. This stuff drives me nuts, always something that doens't work the way you want.

Location:

trunk/src/VBox/ValidationKit/testmanager/htdocs

Files:

• css/common.css (modified) (1 diff)
• css/tooltip.css (modified) (1 diff)
• js/common.js (modified) (7 diffs)

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

@@ -1151 +1151 @@
     border:     0px none;
     width:      100%;
-    overflow:   auto;
+    //overflow:   auto;
+    overflow:   hidden;
 }
 

trunk/src/VBox/ValidationKit/testmanager/htdocs/css/tooltip.css

@@ -115 +115 @@
 
 /* This helps highlighting the revision we're showing the tooltip for. */
-.tmvcstimeline :target, .tmvcstimeline :target + dd {
+.tmvcstimeline-highlight, .tmvcstimeline :target, .tmvcstimeline :target + dd {
     background-color: #d8e8ff;
     padding-top:    0.2em;

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

@@ -32 +32 @@
 var g_ksParamRedirectTo = 'RedirectTo';
 
+
+/**
+ * Detects the firefox browser.
+ */
+function isBrowserFirefox()
+{
+    return typeof InstallTrigger !== 'undefined';
+}
+
+/**
+ * Detects the google chrome browser.
+ * @note Might be confused with edge chromium
+ */
+function isBrowserChrome()
+{
+    var oChrome = window.chrome;
+    if (!oChrome)
+        return false;
+    return !!oChrome.runtime || !oChrome.webstore;
+}
+
+/**
+ * Detects the chromium-based edge browser.
+ */
+function isBrowserEdgeChromium()
+{
+    if (!isBrowserChrome())
+        return false;
+    return navigation.userAgent.indexOf('Edg') >= 0
+}
+
+/**
+ * Detects the safari browser (v3+).
+ */
+function isBrowserSafari()
+{
+    /* Check if window.HTMLElement is a function named 'HTMLElementConstructor()'?
+       Should work for older safari versions. */
+    var sStr = window.HTMLElement.toString();
+    if (/constructor/i.test(sStr))
+        return true;
+
+    /* Check the class name of window.safari.pushNotification.  This works for current. */
+    var oSafari = window['safari'];
+    if (oSafari)
+    {
+        if (typeof oSafari !== 'undefined')
+        {
+            var oPushNotify = oSafari.pushNotification;
+            if (oPushNotify)
+            {
+                sStr = oPushNotify.toString();
+                if (/\[object Safari.*Notification\]/.test(sStr))
+                    return true;
+            }
+        }
+    }
+    return false;
+}
 
 /**
@@ -691 +750 @@
 function tooltipRepositionOnLoad()
 {
+    //console.log('tooltipRepositionOnLoad');
     if (g_oCurrentTooltip)
     {
@@ -784 +844 @@
     }
 
+    oTooltip.oElm.style.position = 'absolute';
     oTooltip.oElm.style.display  = 'block';
-    oTooltip.oElm.style.position = 'absolute';
     oRect = oRelTo.getBoundingClientRect();
     oTooltip.oRelToRect = oRect;
@@ -832 +892 @@
 
 /**
+ * Highlights the desired revision.
+ *
+ * This is a WORKAROUND for browser where we cannot use the URL fragment to
+ * do this.
+ */
+function svnHistoryTooltipHighligh(oTooltip)
+{
+    var iRevision = oTooltip.iRevision;
+    if (false && isBrowserFirefox())
+    {
+        var sDesiredHash = '#r' + iRevision;
+        var sCurrentHash = oTooltip.oIFrame.contentWindow.location.hash;
+        //console.log('before: location.hash=' + sCurrentHash + ' src=' + oTooltip.oIFrame.src);
+        if (sCurrentHash != sDesiredHash)
+        {
+            oTooltip.oIFrame.contentWindow.location.hash = sDesiredHash;
+            oTooltip.oIFrame.contentWindow.location.reload();
+            //console.log('after:  location.hash=' + oTooltip.oIFrame.contentWindow.location.hash + ' src='+oTooltip.oIFrame.src);
+        }
+        return true;
+    }
+
+    /* Clear old selection - not needed as we appear to be reloading the page each time... */
+    var aoElements = oTooltip.oIFrame.contentDocument.getElementsByTagName('dt');
+    var i;
+    for (i = 0; i < aoElements.length; i++)
+        aoElements[i].className = '';
+    aoElements = oTooltip.oIFrame.contentDocument.getElementsByTagName('dd');
+    for (i = 0; i < aoElements.length; i++)
+        aoElements[i].className = '';
+
+    /* New selection: */
+    var oDt = oTooltip.oIFrame.contentDocument.getElementById('r' + iRevision);
+    oDt.className = 'tmvcstimeline-highlight';
+    oDt.nextElementSibling.className = 'tmvcstimeline-highlight';
+
+    return true;
+}
+
+/**
  * iframe.onload hook that repositions and resizes the tooltip.
  *
@@ -848 +948 @@
     {
         var oSubElement = g_oCurrentTooltip.oIFrame;
+        svnHistoryTooltipHighligh(g_oCurrentTooltip); /* do early as it increases the element padding */
+
         var cxSpace  = Math.max(oSubElement.offsetLeft * 2, 0); /* simplified */
         var cySpace  = Math.max(oSubElement.offsetTop  * 2, 0); /* simplified */
@@ -964 +1066 @@
             oTooltip.oElm.style.position = 'absolute';
             oTooltip.oElm.style.zIndex = 6001;
-            oTooltip.xPos    = 0;
-            oTooltip.yPos    = 0;
-            oTooltip.cxMax   = 0;
-            oTooltip.cyMax   = 0;
-            oTooltip.cyMaxUp = 0;
-            oTooltip.xScroll = 0;
-            oTooltip.yScroll = 0;
+            oTooltip.xPos      = 0;
+            oTooltip.yPos      = 0;
+            oTooltip.cxMax     = 0;
+            oTooltip.cyMax     = 0;
+            oTooltip.cyMaxUp   = 0;
+            oTooltip.xScroll   = 0;
+            oTooltip.yScroll   = 0;
+            oTooltip.iRevision = iRevision;   /**< For  :target/highlighting */
 
             oSubElement = document.createElement('iframe');
             oSubElement.setAttribute('id', sKey + '_iframe');
             oSubElement.setAttribute('style', 'position: relative;"');
-            oSubElement.onload       = function() {svnHistoryTooltipOnLoad(); setTimeout(svnHistoryTooltipOnLoad,0);};
             oSubElement.onmouseenter = tooltipElementOnMouseEnter;
             oSubElement.onmouseout   = tooltipElementOnMouseOut;
@@ -983 +1085 @@
 
             document.body.appendChild(oTooltip.oElm);
+
+            oSubElement.onload = function() { tooltipReallyShow(oTooltip, oParent); svnHistoryTooltipOnLoad();  };
+
+            var sUrl = sUrlPrefix + 'index.py?Action=VcsHistoryTooltip&repo=' + sRepository
+                     + '&rev=' + svnHistoryTooltipCalcLastRevision(iRevision)
+                     + '&cEntries=' + g_cTooltipSvnRevisions;
+            if (false && isBrowserFirefox()) /* The other browsers will scroll the main window when jumping to the revision. */
+                sUrl = sUrl + '#r' + iRevision;
+            oSubElement.setAttribute('src', sUrl);
+
         }
         else
         {
-            oSubElement = oTooltip.oIFrame;
-        }
-
-        oSubElement.setAttribute('src', sUrlPrefix + 'index.py?Action=VcsHistoryTooltip&repo=' + sRepository
-                                 + '&rev=' + svnHistoryTooltipCalcLastRevision(iRevision)
-                                 + '&cEntries=' + g_cTooltipSvnRevisions
-                                 + '#r' + iRevision);
-        tooltipReallyShow(oTooltip, oParent);
-        /* Resize and repositioning hacks. */
-        svnHistoryTooltipOnLoad();
-        setTimeout(svnHistoryTooltipOnLoad, 0);
+            /* Show the existing one with different :target/highlighting */
+            oTooltip.iRevision = iRevision;
+            if (false && isBrowserFirefox()) /* The other browsers will scroll the main window when jumping to the revision. */
+                svnHistoryTooltipHighligh(oTooltip);
+            tooltipReallyShow(oTooltip, oParent);
+            svnHistoryTooltipOnLoad();
+        }
     }