REGRESSION (r188581): Web Inspector: Option-Enter no longer inserts a new line in...
authornvasilyev@apple.com <nvasilyev@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 19 Aug 2015 07:11:36 +0000 (07:11 +0000)
committernvasilyev@apple.com <nvasilyev@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 19 Aug 2015 07:11:36 +0000 (07:11 +0000)
https://bugs.webkit.org/show_bug.cgi?id=148165

Make Option-Enter insert a new line, as it was before r188581.
Make Command-Enter keep executed command in the prompt.

Reviewed by Timothy Hatcher.

* UserInterface/Views/ConsolePrompt.js:
(WebInspector.ConsolePrompt): Deleted.
(WebInspector.ConsolePrompt.prototype._handleCommandEnterKey):
(WebInspector.ConsolePrompt.prototype._handleOptionEnterKey): Deleted.
(WebInspector.ConsolePrompt.prototype._handleCommandOptionEnterKey): Deleted.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@188635 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebInspectorUI/ChangeLog
Source/WebInspectorUI/UserInterface/Views/ConsolePrompt.js

index 8c19213..69a2388 100644 (file)
@@ -1,3 +1,19 @@
+2015-08-19  Nikita Vasilyev  <nvasilyev@apple.com>
+
+        REGRESSION (r188581): Web Inspector: Option-Enter no longer inserts a new line in the console
+        https://bugs.webkit.org/show_bug.cgi?id=148165
+
+        Make Option-Enter insert a new line, as it was before r188581.
+        Make Command-Enter keep executed command in the prompt.
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Views/ConsolePrompt.js:
+        (WebInspector.ConsolePrompt): Deleted.
+        (WebInspector.ConsolePrompt.prototype._handleCommandEnterKey):
+        (WebInspector.ConsolePrompt.prototype._handleOptionEnterKey): Deleted.
+        (WebInspector.ConsolePrompt.prototype._handleCommandOptionEnterKey): Deleted.
+
 2015-08-18  Joseph Pecoraro  <pecoraro@apple.com>
 
         Web Inspector: Links for rules in <style> are incorrect, do not account for <style> offset in the document
index b4c7b37..80f494b 100644 (file)
@@ -51,8 +51,6 @@ WebInspector.ConsolePrompt = class ConsolePrompt extends WebInspector.Object
             "Ctrl-N": this._handleNextKey.bind(this),
             "Enter": this._handleEnterKey.bind(this),
             "Cmd-Enter": this._handleCommandEnterKey.bind(this),
-            "Alt-Enter": this._handleOptionEnterKey.bind(this),
-            "Cmd-Alt-Enter": this._handleCommandOptionEnterKey.bind(this),
             "Tab": this._handleTabKey.bind(this),
             "Esc": this._handleEscapeKey.bind(this)
         };
@@ -304,16 +302,6 @@ WebInspector.ConsolePrompt = class ConsolePrompt extends WebInspector.Object
 
     _handleCommandEnterKey(codeMirror)
     {
-        this._handleEnterKey(codeMirror, true);
-    }
-
-    _handleOptionEnterKey(codeMirror)
-    {
-        this._handleEnterKey(codeMirror, false, true);
-    }
-
-    _handleCommandOptionEnterKey(codeMirror)
-    {
         this._handleEnterKey(codeMirror, true, true);
     }