Changeset 35616

Timestamp:

08/06/08 16:07:27 (4 months ago)

Author:

kmccullough@apple.com

Message:

2008-08-06 Kevin McCullough <kmccullough@apple.com>

Reviewed by Tim.

• Created a new function to create DOM links from text without converting back and forth from HTML and messing with escaping special characters.

• page/inspector/Console.js:
• page/inspector/inspector.js:
• page/inspector/utilities.js:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/inspector/Console.js (modified) (3 diffs)
• page/inspector/inspector.js (modified) (1 diff)
• page/inspector/utilities.js (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-08-06  Kevin McCullough  <kmccullough@apple.com>
+
+        Reviewed by Tim.
+
+        - Created a new function to create DOM links from text without
+        converting back and forth from HTML and messing with escaping special
+        characters.
+
+        * page/inspector/Console.js:
+        * page/inspector/inspector.js:
+        * page/inspector/utilities.js:
+
 2008-08-06  Eric Seidel  <eric@webkit.org>
 

trunk/WebCore/page/inspector/Console.js

@@ -407 +407 @@
         if (plainText)
             elem.appendChild(document.createTextNode("\"" + str + "\""));
-        else
-            elem.insertAdjacentHTML("beforeEnd", "\"" + WebInspector.linkifyString(str) + "\"");
+        else {
+            elem.appendChild(document.createTextNode("\""));
+            elem.appendChild(WebInspector.linkifyStringAsFragment(str));
+            elem.appendChild(document.createTextNode("\""));
+        }
     },
 
@@ -516 +519 @@
             {
                 if (!(b instanceof Node))
-                    a.insertAdjacentHTML("beforeEnd", WebInspector.linkifyString(b.toString()));
+                    a.appendChild(WebInspector.linkifyStringAsFragment(b.toString()));
                 else
                     a.appendChild(b);
@@ -531 +534 @@
         for (var i = 0; i < parameters.length; ++i) {
             if (typeof parameters[i] === "string")
-                formattedResult.insertAdjacentHTML("beforeEnd", WebInspector.linkifyString(parameters[i]));
+                formattedResult.appendChild(WebInspector.linkifyStringAsFragment(parameters[i]));
             else
                 formattedResult.appendChild(formatForConsole(parameters[i]));

trunk/WebCore/page/inspector/inspector.js

@@ -916 +916 @@
 }
 
-WebInspector.linkifyString = function(string)
-{
-    function linkify(url)
-    {
-        url = url.unescapeHTML();
-        var realURL = (url.indexOf("www.") === 0 ? "http://" + url : url);
-        return WebInspector.linkifyURL(realURL, url, null, (realURL in WebInspector.resourceURLMap));
-    }
-
-    string = string.escapeHTML();
-    return string.replace(new RegExp("(?:[a-zA-Z][a-zA-Z0-9+.-]{2,}://|www\\.)[\\w$\\-_+*'=\\|/\\\\(){}[\\]%@&#~,:;.!?]{4,}[\\w$\\-_+*=\\|/\\\\({%@&#~]"), linkify);
+WebInspector.linkifyStringAsFragment = function(string)
+{
+    var container = document.createDocumentFragment();
+    var linkStringRegEx = new RegExp("(?:[a-zA-Z][a-zA-Z0-9+.-]{2,}://|www\\.)[\\w$\\-_+*'=\\|/\\\\(){}[\\]%@&#~,:;.!?]{4,}[\\w$\\-_+*=\\|/\\\\({%@&#~]");
+
+    while (string) {
+        var linkString = linkStringRegEx.exec(string);
+        if (!linkString)
+            break;
+
+        linkString = linkString[0];
+        var linkIndex = string.indexOf(linkString);
+        var nonLink = string.substring(0, linkIndex);
+        container.appendChild(document.createTextNode(nonLink));
+        var realURL = (linkString.indexOf("www.") === 0 ? "http://" + linkString : linkString);
+        container.appendChild(WebInspector.linkifyURLAsNode(realURL, linkString, null, (realURL in WebInspector.resourceURLMap)));
+        string = string.substring(linkIndex + linkString.length, string.length);
+    }
+
+    if (string)
+        container.appendChild(document.createTextNode(string));
+    
+    return container;
+}
+
+WebInspector.linkifyURLAsNode = function(url, linkText, classes, isExternal)
+{
+    if (!linkText)
+        linkText = url;
+    classes = (classes ? classes + " " : "");
+    classes += isExternal ? "webkit-html-external-link" : "webkit-html-resource-link";
+
+    var a = document.createElement("a");
+    a.href = url;
+    a.className = classes;
+    a.title = url;
+    a.target = "_blank";
+    a.textContent = linkText;
+    
+    return a;
 }
 

trunk/WebCore/page/inspector/utilities.js

@@ -349 +349 @@
 {
     return this.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
-}
-
-String.prototype.unescapeHTML = function()
-{
-    return this.replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&amp;/g, "&");
 }