Changeset 55517 in webkit

Timestamp:

Mar 4, 2010 4:21:10 AM (14 years ago)

Author:

apavlov@chromium.org

Message:

2010-03-04 Alexander Pavlov <​apavlov@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: Nothing happens on navigation to resource via a link if resource tracking is disabled
​https://bugs.webkit.org/show_bug.cgi?id=35574

• English.lproj/localizedStrings.js:
• inspector/front-end/ResourcesPanel.js: (WebInspector.ResourcesPanel.prototype.canShowSourceLine): (WebInspector.ResourcesPanel.prototype._toggleResourceTracking):
• inspector/front-end/inspector.js: (WebInspector.documentMouseOver): (WebInspector.documentMouseOut): (WebInspector.hideBadLinkPopupIfNecessary): (WebInspector.documentClick.followLink): (WebInspector.documentClick): (WebInspector.showBadLinkPopup.popupOverOut): (WebInspector.showBadLinkPopup): (WebInspector.addMainEventListeners):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• English.lproj/localizedStrings.js (modified) (previous)
• inspector/front-end/ResourcesPanel.js (modified) (2 diffs)
• inspector/front-end/inspector.js (modified) (5 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-04  Alexander Pavlov  <apavlov@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: Nothing happens on navigation to resource via a link if resource tracking is disabled
+        https://bugs.webkit.org/show_bug.cgi?id=35574
+
+        * English.lproj/localizedStrings.js:
+        * inspector/front-end/ResourcesPanel.js:
+        (WebInspector.ResourcesPanel.prototype.canShowSourceLine):
+        (WebInspector.ResourcesPanel.prototype._toggleResourceTracking):
+        * inspector/front-end/inspector.js:
+        (WebInspector.documentMouseOver):
+        (WebInspector.documentMouseOut):
+        (WebInspector.hideBadLinkPopupIfNecessary):
+        (WebInspector.documentClick.followLink):
+        (WebInspector.documentClick):
+        (WebInspector.showBadLinkPopup.popupOverOut):
+        (WebInspector.showBadLinkPopup):
+        (WebInspector.addMainEventListeners):
+
 2010-03-04  Vangelis Kokkevis  <vangelis@chromium.org>
 

trunk/WebCore/inspector/front-end/ResourcesPanel.js

@@ -460 +460 @@
     canShowSourceLine: function(url, line)
     {
-        return !!WebInspector.resourceForURL(url);
+        return !!WebInspector.resourceForURL(url) && InspectorBackend.resourceTrackingEnabled();
     },
 
@@ -701 +701 @@
             this.largerResourcesButton.visible = false;
             this.sortingSelectElement.visible = false;
+            WebInspector.resources = {};
+            WebInspector.resourceURLMap = {};
             InspectorBackend.disableResourceTracking(true);
         } else {

trunk/WebCore/inspector/front-end/inspector.js

@@ -64 +64 @@
     // 5 - ?fragment
     URLRegExp: /^(http[s]?|file):\/\/([^\/:]*)(?::([\d]+))?(?:(\/[^#]*)(?:#(.*))?)?$/i,
+    GenericURLRegExp: /^([^:]+):\/\/([^\/:]*)(?::([\d]+))?(?:(\/[^#]*)(?:#(.*))?)?$/i,
 
     get platform()
@@ -611 +612 @@
 }
 
+WebInspector.documentMouseOver = function(event)
+{
+    if (event.target.tagName !== "A")
+        return;
+
+    const anchor = event.target;
+    if (!anchor.hasStyleClass("webkit-html-external-link") && !anchor.hasStyleClass("webkit-html-resource-link"))
+        return;
+
+    if (WebInspector.canShowSourceLine(anchor.href, anchor.lineNumber, anchor.preferredPanel) || WebInspector.ProfileType.URLRegExp.exec(anchor.href))
+        return;
+
+    WebInspector._showPopupTimer = setTimeout(WebInspector.showBadLinkPopup.bind(WebInspector, anchor), 250);
+}
+
+WebInspector.documentMouseOut = function(event)
+{
+    if (event.target.tagName !== "A")
+        return;
+
+    if (WebInspector._showPopupTimer) {
+        clearTimeout(WebInspector._showPopupTimer);
+        delete WebInspector._showPopupTimer;
+    } else if (WebInspector._badLinkPopup && !this._mouseOverPopup)
+        WebInspector._hidePopupTimer = setTimeout(WebInspector.hideBadLinkPopupIfNecessary.bind(WebInspector), 750);
+}
+
+WebInspector.hideBadLinkPopupIfNecessary = function()
+{
+    if (!this._badLinkPopup)
+        return;
+    this._badLinkPopup.hide();
+    delete this._badLinkPopup;
+    if (this._hidePopupTimer) {
+        clearTimeout(this._hidePopupTimer);
+        delete this._hidePopupTimer;
+    }
+}
+
 WebInspector.documentClick = function(event)
 {
@@ -630 +670 @@
 
             WebInspector.showSourceLine(anchor.href, anchor.lineNumber, anchor.preferredPanel);
-        } else {
-            var profileString = WebInspector.ProfileType.URLRegExp.exec(anchor.href);
-            if (profileString)
-                WebInspector.showProfileForURL(anchor.href);
-        }
+            return;
+        }
+
+        const profileMatch = WebInspector.ProfileType.URLRegExp.exec(anchor.href);
+        if (profileMatch) {
+            WebInspector.showProfileForURL(anchor.href);
+            return;
+        }
+
+        const urlMatch = WebInspector.GenericURLRegExp.exec(anchor.href);
+        if (urlMatch && urlMatch[1] === "webkit-link-action") {
+            if (urlMatch[2] === "show-panel") {
+                const panel = urlMatch[4].substring(1);
+                if (WebInspector.panels[panel])
+                    WebInspector.currentPanel = WebInspector.panels[panel];
+            }
+            return;
+        }
+
+        WebInspector.showBadLinkPopup(anchor);
     }
 
@@ -649 +704 @@
 
     followLink();
+}
+
+WebInspector.showBadLinkPopup = function(anchor)
+{
+    this.hideBadLinkPopupIfNecessary();
+
+    // Show an info popup for a link that cannot be opened right away.
+    var popupContentElement = document.createElement("span");
+    popupContentElement.className = "monospace";
+
+    var message = WebInspector.UIString(
+        "Cannot open this link. Make sure that resource tracking is enabled in the %s panel.");
+    var anchorIndex = message.indexOf("%s");
+    if (anchorIndex < 0) {
+        var leftPart = message;
+        var rightPart = "";
+    } else {
+        var leftPart = message.substring(0, anchorIndex);
+        var panelAnchorElement = document.createElement("a");
+        panelAnchorElement.href = "webkit-link-action://show-panel/resources";
+        panelAnchorElement.textContent = WebInspector.UIString("Resources");
+        var rightPart = message.substring(anchorIndex + 2);
+    }
+    popupContentElement.appendChild(document.createTextNode(leftPart));
+    if (panelAnchorElement)
+        popupContentElement.appendChild(panelAnchorElement);
+    popupContentElement.appendChild(document.createTextNode(rightPart));
+    var popup = new WebInspector.Popover(popupContentElement);
+
+    if (panelAnchorElement)
+        panelAnchorElement.addEventListener("click", this.hideBadLinkPopupIfNecessary.bind(this));
+
+    function popupOverOut(event)
+    {
+        if (event.type === "mouseover") {
+            if (this._mouseOverPopup)
+                return; // Entered from child.
+            clearTimeout(this._hidePopupTimer);
+            delete this._hidePopupTimer;
+            this._mouseOverPopup = true;
+        } else {
+            const relTarget = event.relatedTarget;
+            if (relTarget && relTarget.enclosingNodeOrSelfWithClass("popover"))
+                return; // Leaving to child.
+            delete this._mouseOverPopup;
+            this.hideBadLinkPopupIfNecessary();
+        }
+    }
+    const boundHandler = popupOverOut.bind(this);
+    popupContentElement.addEventListener("mouseover", boundHandler, true);
+    popupContentElement.addEventListener("mouseout", boundHandler, true);
+
+    popup.show(anchor);
+    this._badLinkPopup = popup;
+    delete this._showPopupTimer;
 }
 
@@ -1595 +1705 @@
     doc.defaultView.addEventListener("blur", this.windowBlurred.bind(this), false);
     doc.addEventListener("click", this.documentClick.bind(this), true);
+    doc.addEventListener("mouseover", this.documentMouseOver.bind(this), true);
+    doc.addEventListener("mouseout", this.documentMouseOut.bind(this), true);
 }