[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

caseq at chromium.org caseq at chromium.org
Wed Dec 22 13:24:06 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit fc116925be7ffa3d753f67fcb784790c17df325c
Author: caseq at chromium.org <caseq at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 14 09:10:20 2010 +0000

    2010-09-13  Andrey Kosyakov  <caseq at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: provide support for opening external navigation for links within certain elements
            Use default handling for clicks on links that have target="_blank"
            Add option for external navigation to URL audit formatter.
            https://bugs.webkit.org/show_bug.cgi?id=45671
    
            * inspector/front-end/AuditFormatters.js:
            (WebInspector.AuditFormatters.url):
            * inspector/front-end/inspector.js:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67454 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c1dccef..51106e5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-13  Andrey Kosyakov  <caseq at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: provide support for opening external navigation for links within certain elements
+        Use default handling for clicks on links that have target="_blank".
+        Add option for external navigation to URL audit formatter.
+        https://bugs.webkit.org/show_bug.cgi?id=45671
+
+        * inspector/front-end/AuditFormatters.js:
+        (WebInspector.AuditFormatters.url):
+        * inspector/front-end/inspector.js:
+
 2010-09-14  Dan Bernstein  <mitz at apple.com>
 
         Build fix.
diff --git a/WebCore/inspector/front-end/AuditFormatters.js b/WebCore/inspector/front-end/AuditFormatters.js
index de277ad..1bc1803 100644
--- a/WebCore/inspector/front-end/AuditFormatters.js
+++ b/WebCore/inspector/front-end/AuditFormatters.js
@@ -79,8 +79,14 @@ WebInspector.AuditFormatters = {
         return parent;
     },
 
-    url: function(url, displayText)
+    url: function(url, displayText, allowExternalNavigation)
     {
-        return WebInspector.linkifyURLAsNode(url, displayText || url, null, (url in WebInspector.resourceURLMap));
+        var a = document.createElement("a");
+        a.href = url;
+        a.title = url;
+        a.textContent = displayText || url;
+        if (allowExternalNavigation)
+            a.target = "_blank";
+        return a;
     }
 };
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index cb5c83c..3fdd5b4 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -736,7 +736,7 @@ WebInspector.documentMouseOver = function(event)
 WebInspector.documentClick = function(event)
 {
     var anchor = event.target.enclosingNodeOrSelfWithNodeName("a");
-    if (!anchor)
+    if (!anchor || anchor.target === "_blank")
         return;
 
     // Prevent the link from navigating, since we don't do any navigation by following links normally.
@@ -1819,7 +1819,6 @@ WebInspector.linkifyURLAsNode = function(url, linkText, classes, isExternal, too
         a.title = url;
     else if (typeof tooltipText !== "string" || tooltipText.length)
         a.title = tooltipText;
-    a.target = "_blank";
     a.textContent = linkText;
 
     return a;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list