Changeset 243826 in webkit

Timestamp:

Apr 3, 2019, 2:03:58 PM (6 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Single click on links in non-read-only TextEditors should not follow links
​https://bugs.webkit.org/show_bug.cgi?id=123364
<rdar://problem/15323913>

Reviewed by Timothy Hatcher.

• UserInterface/Base/Main.js:

(WI._updateModifierKeys):
Add classes to the body whenever alt, shift, or ctrl are pressed.

• UserInterface/Views/CodeMirrorEditor.js:

(WI.CodeMirrorEditor.create):
Add a read-only class if the CodeMirror is readonly.

• UserInterface/Views/SyntaxHighlightingDefaultTheme.css:

(.cm-s-default .cm-link,):
(.read-only.cm-s-default .cm-link:hover,):
(.cm-s-default .cm-link:hover,): Deleted.

• UserInterface/Views/TextEditor.js:

(WI.TextEditor.prototype.set readOnly):
(WI.TextEditor.prototype._openClickedLinks):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Base/Main.js (modified) (1 diff)
• UserInterface/Views/CodeMirrorEditor.js (modified) (1 diff)
• UserInterface/Views/SyntaxHighlightingDefaultTheme.css (modified) (1 diff)
• UserInterface/Views/TextEditor.js (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-04-03  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Single click on links in non-read-only TextEditors should not follow links
+        https://bugs.webkit.org/show_bug.cgi?id=123364
+        <rdar://problem/15323913>
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Base/Main.js:
+        (WI._updateModifierKeys):
+        Add classes to the body whenever alt, shift, or ctrl are pressed.
+
+        * UserInterface/Views/CodeMirrorEditor.js:
+        (WI.CodeMirrorEditor.create):
+        Add a `read-only` class if the `CodeMirror` is readonly.
+
+        * UserInterface/Views/SyntaxHighlightingDefaultTheme.css:
+        (.cm-s-default .cm-link,):
+        (.read-only.cm-s-default .cm-link:hover,):
+        (.cm-s-default .cm-link:hover,): Deleted.
+
+        * UserInterface/Views/TextEditor.js:
+        (WI.TextEditor.prototype.set readOnly):
+        (WI.TextEditor.prototype._openClickedLinks):
+
 2019-04-03  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Base/Main.js

@@ -1652 +1652 @@
 WI._updateModifierKeys = function(event)
 {
-    let metaKeyDidChange = this.modifierKeys.metaKey !== event.metaKey;
-    let didChange = this.modifierKeys.altKey !== event.altKey || metaKeyDidChange || this.modifierKeys.shiftKey !== event.shiftKey;
-
-    this.modifierKeys = {altKey: event.altKey, metaKey: event.metaKey, shiftKey: event.shiftKey};
-
-    if (metaKeyDidChange)
-        document.body.classList.toggle("meta-key-pressed", this.modifierKeys.metaKey);
-
-    if (didChange)
+    let keys = {
+        altKey: event.altKey,
+        metaKey: event.metaKey,
+        ctrlKey: event.ctrlKey,
+        shiftKey: event.shiftKey,
+    };
+
+    let changed = !Object.shallowEqual(this.modifierKeys, keys);
+
+    this.modifierKeys = keys;
+
+    document.body.classList.toggle("alt-key-pressed", this.modifierKeys.altKey);
+    document.body.classList.toggle("ctrl-key-pressed", this.modifierKeys.ctrlKey);
+    document.body.classList.toggle("meta-key-pressed", this.modifierKeys.metaKey);
+    document.body.classList.toggle("shift-key-pressed", this.modifierKeys.shiftKey);
+
+    if (changed)
         this.notifications.dispatchEventToListeners(WI.Notification.GlobalModifierKeysDidChange, event);
 };

trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorEditor.js

@@ -32 +32 @@
         // Clients can override this if custom layout for RTL is available.
         element.setAttribute("dir", "ltr");
+        element.classList.toggle("read-only", options.readOnly);
 
         let codeMirror = new CodeMirror(element, options);

trunk/Source/WebInspectorUI/UserInterface/Views/SyntaxHighlightingDefaultTheme.css

@@ -83 +83 @@
 .syntax-highlighted a {
     text-decoration: none;
-    cursor: pointer;
 }
 
-.cm-s-default .cm-link:hover,
+.read-only.cm-s-default .cm-link:hover,
+.mac-platform.meta-key-pressed :not(.read-only).cm-s-default .cm-link:hover,
+:not(.mac-platform).control-key-pressed :not(.read-only).cm-s-default .cm-link:hover,
 .syntax-highlighted a:hover {
     text-decoration: underline;
+    cursor: pointer;
 }
 

trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.js

@@ -181 +181 @@
     {
         this._codeMirror.setOption("readOnly", readOnly);
+        this._codeMirror.getWrapperElement().classList.toggle("read-only", !!readOnly);
     }
 
@@ -1688 +1689 @@
     _openClickedLinks(event)
     {
+        if (!this.readOnly && !event.commandOrControlKey)
+            return;
+
         // Get the position in the text and the token at that position.
         var position = this._codeMirror.coordsChar({left: event.pageX, top: event.pageY});