Changeset 147535 in webkit

Timestamp:

Apr 3, 2013 3:24:58 AM (11 years ago)

Author:

apavlov@chromium.org

Message:

Web Inspector: [REGRESSION(r147117)][Elements] Copy/paste keyboard shortcuts broken in "Edit as HTML"
​https://bugs.webkit.org/show_bug.cgi?id=113798

Reviewed by Yury Semikhatsky.

Stop propagation of "copy" event from the multiline editor's
CodeMirror host element so that it is not handled by
WebInspector.documentCopy().

• inspector/front-end/UIUtils.js:

(.consumeCopy):
(.cleanUpAfterEditing):

• inspector/front-end/inspector.js:

(WebInspector.addMainEventListeners):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/UIUtils.js (modified) (3 diffs)
• inspector/front-end/inspector.js (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-03  Alexander Pavlov  <apavlov@chromium.org>
+
+        Web Inspector: [REGRESSION(r147117)][Elements] Copy/paste keyboard shortcuts broken in "Edit as HTML"
+        https://bugs.webkit.org/show_bug.cgi?id=113798
+
+        Reviewed by Yury Semikhatsky.
+
+        Stop propagation of "copy" event from the multiline editor's
+        CodeMirror host element so that it is not handled by
+        WebInspector.documentCopy().
+
+        * inspector/front-end/UIUtils.js:
+        (.consumeCopy):
+        (.cleanUpAfterEditing):
+        * inspector/front-end/inspector.js:
+        (WebInspector.addMainEventListeners):
+
 2013-04-03  Takashi Sakamoto  <tasak@google.com>
 

trunk/Source/WebCore/inspector/front-end/UIUtils.js

@@ -448 +448 @@
     var cssLoadView;
 
+    function consumeCopy(e)
+    {
+        e.consume();
+    }
+
     if (isMultiline) {
         loadScript("CodeMirrorTextEditor.js");
@@ -453 +458 @@
         cssLoadView.show(element);
         WebInspector.setCurrentFocusElement(element);
+        element.addEventListener("copy", consumeCopy, true);
         codeMirror = window.CodeMirror(element, {
             mode: config.mode,
@@ -501 +507 @@
 
         if (isMultiline) {
+            element.removeEventListener("copy", consumeCopy, true);
             cssLoadView.detach();
             return;

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

@@ -1017 +1017 @@
     doc.addEventListener("keydown", this.postDocumentKeyDown.bind(this), false);
     doc.addEventListener("beforecopy", this.documentCanCopy.bind(this), true);
-    doc.addEventListener("copy", this.documentCopy.bind(this), true);
+    doc.addEventListener("copy", this.documentCopy.bind(this), false);
     doc.addEventListener("contextmenu", this.contextMenuEventFired.bind(this), true);
     doc.addEventListener("click", this.documentClick.bind(this), true);