Title: [158593] branches/safari-537.73-branch/Source/WebInspectorUI
- Revision
- 158593
- Author
- [email protected]
- Date
- 2013-11-04 13:53:27 -0800 (Mon, 04 Nov 2013)
Log Message
Merged r158061. <rdar://problem/15333281>
Modified Paths
Diff
Modified: branches/safari-537.73-branch/Source/WebInspectorUI/ChangeLog (158592 => 158593)
--- branches/safari-537.73-branch/Source/WebInspectorUI/ChangeLog 2013-11-04 21:50:57 UTC (rev 158592)
+++ branches/safari-537.73-branch/Source/WebInspectorUI/ChangeLog 2013-11-04 21:53:27 UTC (rev 158593)
@@ -1,5 +1,20 @@
2013-11-04 Lucas Forschler <[email protected]>
+ Merge r158061
+
+ 2013-10-25 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Command+Click on url(…) should go to image not source line
+ https://bugs.webkit.org/show_bug.cgi?id=123362
+
+ Reviewed by Timothy Hatcher.
+
+ CodeMirror changed "url" from being type "variable-2" to "string-2".
+
+ * UserInterface/CodeMirrorAdditions.js:
+
+2013-11-04 Lucas Forschler <[email protected]>
+
Merge r154897
2013-08-29 Timothy Hatcher <[email protected]>
Modified: branches/safari-537.73-branch/Source/WebInspectorUI/UserInterface/CodeMirrorAdditions.js (158592 => 158593)
--- branches/safari-537.73-branch/Source/WebInspectorUI/UserInterface/CodeMirrorAdditions.js 2013-11-04 21:50:57 UTC (rev 158592)
+++ branches/safari-537.73-branch/Source/WebInspectorUI/UserInterface/CodeMirrorAdditions.js 2013-11-04 21:53:27 UTC (rev 158593)
@@ -187,7 +187,7 @@
var style = this._token(stream, state);
if (style) {
- if (style === "variable-2" && stream.current() === "url") {
+ if (style === "string-2" && stream.current() === "url") {
// If the current text is "url" then we should expect the next string token to be a link.
state._expectLink = true;
} else if (state._expectLink && style === "string") {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
