Title: [193251] branches/safari-601-branch/Source/WebInspectorUI
- Revision
- 193251
- Author
- [email protected]
- Date
- 2015-12-03 11:02:09 -0800 (Thu, 03 Dec 2015)
Log Message
Merge r190651. rdar://problem/23221163
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193250 => 193251)
--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:02:04 UTC (rev 193250)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:02:09 UTC (rev 193251)
@@ -1,5 +1,26 @@
2015-12-02 Timothy Hatcher <[email protected]>
+ Merge r190651. rdar://problem/23221163
+
+ 2015-10-06 Nikita Vasilyev <[email protected]>
+
+ Web Inspector: Clicking on a stack trace link does not navigate to the corresponding line
+ https://bugs.webkit.org/show_bug.cgi?id=149405
+
+ lineNumber should be a number type but it was a string.
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Base/Main.js:
+ (WebInspector.openURL):
+ (WebInspector.linkifyStringAsFragmentWithCustomLinkifier):
+ Keep lineNumber undefined when it isn't present in the string.
+ WebInspector.linkifyStringAsFragmentWithCustomLinkifier is only used by
+ WebInspector.linkifyStringAsFragment and it expects lineNumber to be undefined
+ when it wasn't found in the parsed string.
+
+2015-12-02 Timothy Hatcher <[email protected]>
+
Merge r190640. rdar://problem/23221163
2015-10-06 Devin Rousso <[email protected]>
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Main.js (193250 => 193251)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Main.js 2015-12-03 19:02:04 UTC (rev 193250)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Main.js 2015-12-03 19:02:09 UTC (rev 193251)
@@ -666,6 +666,8 @@
if (!url)
return;
+ console.assert(typeof lineNumber === "undefined" || typeof lineNumber === "number", "lineNumber should be a number.");
+
// If alwaysOpenExternally is not defined, base it off the command/meta key for the current event.
if (alwaysOpenExternally === undefined || alwaysOpenExternally === null)
alwaysOpenExternally = window.event ? window.event.metaKey : false;
@@ -2034,7 +2036,11 @@
if (lineColumnMatch)
realURL = realURL.substring(0, realURL.length - lineColumnMatch[0].length);
- var linkNode = linkifier(title, realURL, lineColumnMatch ? lineColumnMatch[1] : undefined);
+ var lineNumber;
+ if (lineColumnMatch)
+ lineNumber = parseInt(lineColumnMatch[1]) - 1;
+
+ var linkNode = linkifier(title, realURL, lineNumber);
container.appendChild(linkNode);
string = string.substring(linkIndex + linkString.length, string.length);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
