Revert of DevTools: [Elements] F2 should commit changes in edit-as-html

Source/devtools/front_end/elements/ElementsTreeElement.js

 /*
  * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 648 matching lines @@
 
         var attributeValue = attributeName && attributeValueElement ? this._node.getAttribute(attributeName) : undefined;
         if (attributeValue !== undefined)
             attributeValueElement.setTextContentTruncatedIfNeeded(attributeValue, WebInspector.UIString("<value is too large to edit>"));
 
         // Remove zero-width spaces that were added by nodeTitleInfo.
         removeZeroWidthSpaceRecursive(attribute);
 
         var config = new WebInspector.InplaceEditor.Config(this._attributeEditingCommitted.bind(this), this._editingCancelled.bind(this), attributeName);
 
-        /**
-         * @param {!Event} event
-         * @return {string}
-         */
-        function postKeyDownFinishHandler(event)
+        function handleKeyDownEvents(event)
         {
-            WebInspector.handleElementValueModifications(event, attribute);
-            return "";
+            var isMetaOrCtrl = WebInspector.isMac() ?
+                event.metaKey && !event.shiftKey && !event.ctrlKey && !event.altKey :
+                event.ctrlKey && !event.shiftKey && !event.metaKey && !event.altKey;
+            if (isEnterKey(event) && (event.isMetaOrCtrlForTest || !config.multiline || isMetaOrCtrl))
+                return "commit";
+            else if (event.keyCode === WebInspector.KeyboardShortcut.Keys.Esc.code || event.keyIdentifier === "U+001B")
+                return "cancel";
+            else if (event.keyIdentifier === "U+0009") // Tab key
+                return "move-" + (event.shiftKey ? "backward" : "forward");
+            else {
+                WebInspector.handleElementValueModifications(event, attribute);
+                return "";
+            }
         }
-        config.setPostKeydownFinishHandler(postKeyDownFinishHandler);
+
+        config.customFinishHandler = handleKeyDownEvents;
 
         this._editing = WebInspector.InplaceEditor.startEditing(attribute, config);
 
         this.listItemElement.getComponentSelection().setBaseAndExtent(elementForSelection, 0, elementForSelection, 1);
 
         return true;
     },
 
     /**
      * @param {!Element} textNodeElement
@@ skipping 144 matching lines @@
             while (child) {
                 child.style.removeProperty("display");
                 child = child.nextSibling;
             }
 
             this.treeOutline.element.removeEventListener("mousedown", consume, false);
             this.updateSelection();
             this.treeOutline.focus();
         }
 
-        /**
-         * @param {!Event} event
-         * @return {string}
-         */
-        function postKeyDownFinishHandler(event)
-        {
-            if (event.keyCode === WebInspector.KeyboardShortcut.Keys.F2.code)
-                return "commit";
-            return "";
-        }
-
         var config = new WebInspector.InplaceEditor.Config(commit.bind(this), dispose.bind(this));
         config.setMultilineOptions(initialValue, { name: "xml", htmlMode: true }, "web-inspector-html", WebInspector.moduleSetting("domWordWrap").get(), true);
-        config.setPostKeydownFinishHandler(postKeyDownFinishHandler);
         WebInspector.InplaceEditor.startMultilineEditing(this._htmlEditElement, config).then(markAsBeingEdited.bind(this));
 
         /**
          * @param {!Object} controller
          * @this {WebInspector.ElementsTreeElement}
          */
         function markAsBeingEdited(controller)
         {
             this._editing = /** @type {!WebInspector.InplaceEditor.Controller} */ (controller);
             this._editing.setWidth(this.treeOutline.visibleWidth());
@@ skipping 662 matching lines @@
 
             if (object)
                 object.callFunction(scrollIntoView);
         }
 
         this._node.resolveToObject("", scrollIntoViewCallback);
     },
 
     __proto__: TreeElement.prototype
 }