Changeset 124792 in webkit


Ignore:
Timestamp:
Aug 6, 2012 12:04:31 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Web Inspector: WebInspector.linkifyStringAsFragment gives wrong typeof lineNumber
​https://bugs.webkit.org/show_bug.cgi?id=93019

Patch by John J. Barton <​johnjbarton@chromium.org> on 2012-08-06
Reviewed by Pavel Feldman.

Source/WebCore:

Add test for WebInspector.linkifyStringAsFragment()

  • inspector/front-end/ResourceUtils.js:

(WebInspector.linkifyStringAsFragmentWithCustomLinkifier):

LayoutTests:

parseInt the RegExp match for lineNumber
New test case added to linkify.html

  • inspector/debugger/linkifier-expected.txt:
  • inspector/debugger/linkifier.html:
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r124791 r124792  
     12012-08-06  John J. Barton  <johnjbarton@chromium.org>
     2
     3        Web Inspector: WebInspector.linkifyStringAsFragment gives wrong typeof lineNumber
     4        https://bugs.webkit.org/show_bug.cgi?id=93019
     5
     6        Reviewed by Pavel Feldman.
     7
     8        parseInt the RegExp match for lineNumber
     9        New test case added to linkify.html
     10
     11        * inspector/debugger/linkifier-expected.txt:
     12        * inspector/debugger/linkifier.html:
     13
    1142012-08-06  Dmitry Titov  <dimich@chromium.org>
    215

  • trunk/LayoutTests/inspector/debugger/linkifier-expected.txt

    r115961 r124792  
    22
    33Debugger was enabled.
     4The string "at triggerError (http://localhost/show/:22:11) " linkifies to url: http://localhost/show/
     5The lineNumber is 22 with type number
    46listeners added on raw source code: 1
    57original location: linkifier.html:9

  • trunk/LayoutTests/inspector/debugger/linkifier.html

    r121949 r124792  
    4141            }
    4242        }
     43
     44        var linkifyMe = "at triggerError (http://localhost/show/:22:11)";
     45        var fragment = WebInspector.linkifyStringAsFragment(linkifyMe);
     46        var anchor = fragment.querySelector('a');
     47        InspectorTest.addResult("The string \"" + linkifyMe + " \" linkifies to url: " + anchor.href);
     48        InspectorTest.addResult("The lineNumber is " + anchor.lineNumber + " with type " + (typeof anchor.lineNumber));
    4349
    4450        linkifier = new WebInspector.Linkifier();

  • trunk/Source/WebCore/ChangeLog

    r124784 r124792  
     12012-08-06  John J. Barton  <johnjbarton@chromium.org>
     2
     3        Web Inspector: WebInspector.linkifyStringAsFragment gives wrong typeof lineNumber
     4        https://bugs.webkit.org/show_bug.cgi?id=93019
     5
     6        Reviewed by Pavel Feldman.
     7
     8        Add test for WebInspector.linkifyStringAsFragment()
     9
     10        * inspector/front-end/ResourceUtils.js:
     11        (WebInspector.linkifyStringAsFragmentWithCustomLinkifier):
     12
    1132012-08-06  David Reveman  <reveman@chromium.org>
    214

  • trunk/Source/WebCore/inspector/front-end/ResourceUtils.js

    r124590 r124792  
    183183/**
    184184 * @param {string} string
    185  * @param {function(string,string,string=):Node} linkifier
     185 * @param {function(string,string,number=):Node} linkifier
    186186 * @return {DocumentFragment}
    187187 */
    … …  
    205205        var realURL = (linkString.startsWith("www.") ? "http://" + linkString : linkString);
    206206        var lineColumnMatch = lineColumnRegEx.exec(realURL);
    207         if (lineColumnMatch)
     207        var lineNumber;
     208        if (lineColumnMatch) {
    208209            realURL = realURL.substring(0, realURL.length - lineColumnMatch[0].length);
    209 
    210         var linkNode = linkifier(title, realURL, lineColumnMatch ? lineColumnMatch[1] : undefined);
     210            lineNumber = parseInt(lineColumnMatch[1], 10);
     211            lineNumber = isNaN(lineNumber) ? undefined : lineNumber;
     212        }
     213
     214        var linkNode = linkifier(title, realURL, lineNumber);
    211215        container.appendChild(linkNode);
    212216        string = string.substring(linkIndex + linkString.length, string.length);
    … …  
    238242     * @param {string} title
    239243     * @param {string} url
    240      * @param {string=} lineNumber
     244     * @param {number=} lineNumber
    241245     * @return {Node}
    242246     */
Note: See TracChangeset for help on using the changeset viewer.