DevTools: Migrate elements panel undo/redo shortcuts to declarative actions.

Source/devtools/front_end/elements/ElementsPanel.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 186 matching lines @@
             var treeOutline = this._treeOutlines[i];
             treeOutline.updateSelection();
             treeOutline.setVisible(true);
 
             if (!treeOutline.rootDOMNode)
                 if (treeOutline.domModel().existingDocument())
                     this._documentUpdated(treeOutline.domModel(), treeOutline.domModel().existingDocument());
                 else
                     treeOutline.domModel().requestDocument();
         }
-
+        WebInspector.context.setFlavor(WebInspector.ElementsPanel, this);
     },
 
     willHide: function()
     {
         for (var i = 0; i < this._treeOutlines.length; ++i) {
             var treeOutline = this._treeOutlines[i];
             treeOutline.domModel().hideDOMNodeHighlight();
             treeOutline.setVisible(false);
             // Detach heavy component on hide
             this._contentElement.removeChild(treeOutline.element);
         }
         this._popoverHelper.hidePopover();
         WebInspector.Panel.prototype.willHide.call(this);
+        WebInspector.context.setFlavor(WebInspector.ElementsPanel, null);
     },
 
     onResize: function()
     {
         this._updateTreeOutlineVisibleWidth();
     },
 
     /**
      * @param {!WebInspector.DOMNode} node
      * @param {string} pseudoClass
@@ skipping 451 matching lines @@
     {
         var selectedDOMNode = this.selectedDOMNode();
         if (!selectedDOMNode || !selectedDOMNode.target().cssModel.isEnabled())
             return;
 
         this.sidebarPanes.styles.update(selectedDOMNode, true);
         this.sidebarPanes.metrics.setNode(selectedDOMNode);
         this.sidebarPanes.platformFonts.setNode(selectedDOMNode);
     },
 
+    _undo: function()
+    {
+        var treeOutline = this._treeOutlineForNode(this._lastValidSelectedNode);
+        if (!treeOutline)
+            return;
+        if (treeOutline.editing())

[apavlov, 2014/11/07 17:24:49]

You should also check that no sidebar is being edited too (e.g. that no CSS
property is being edited in StylesSidebarPane). Otherwise this will break Ctrl+Z
in their contenteditable elements

+            return;
+        treeOutline.target().domModel.undo(this._updateSidebars.bind(this));
+    },
+
+    _redo: function()
+    {
+        var treeOutline = this._treeOutlineForNode(this._lastValidSelectedNode);
+        if (!treeOutline)
+            return;
+        if (treeOutline.editing())

[apavlov, 2014/11/07 17:24:49]

ditto

+            return;
+        treeOutline.target().domModel.redo(this._updateSidebars.bind(this));
+    },
+
     /**
      * @param {!KeyboardEvent} event
      */
     handleShortcut: function(event)
     {
-        /**
-         * @param {!WebInspector.ElementsTreeOutline} treeOutline
-         * @this {WebInspector.ElementsPanel}
-         */
-        function handleUndoRedo(treeOutline)
-        {
-            if (WebInspector.KeyboardShortcut.eventHasCtrlOrMeta(event) && !event.shiftKey && event.keyIdentifier === "U+005A") { // Z key
-                treeOutline.target().domModel.undo(this._updateSidebars.bind(this));
-                event.handled = true;
-                return;
-            }
-
-            var isRedoKey = WebInspector.isMac() ? event.metaKey && event.shiftKey && event.keyIdentifier === "U+005A" : // Z key
-                                                   event.ctrlKey && event.keyIdentifier === "U+0059"; // Y key
-            if (isRedoKey) {
-                treeOutline.target().domModel.redo(this._updateSidebars.bind(this));
-                event.handled = true;
-            }
-        }
-
-        var treeOutline = null;
-        for (var i = 0; i < this._treeOutlines.length; ++i) {
-            if (this._treeOutlines[i].selectedDOMNode() === this._lastValidSelectedNode)
-                treeOutline = this._treeOutlines[i];
-        }
+        var treeOutline = this._treeOutlineForNode(this._lastValidSelectedNode);
         if (!treeOutline)
             return;
 
-        if (!treeOutline.editing()) {
-            handleUndoRedo.call(this, treeOutline);
-            if (event.handled)
-                return;
-        }
-
         treeOutline.handleShortcut(event);
         if (event.handled)
             return;
 
         WebInspector.Panel.prototype.handleShortcut.call(this, event);
     },
 
     /**
      * @param {?WebInspector.DOMNode} node
      * @return {?WebInspector.ElementsTreeOutline}
@@ skipping 363 matching lines @@
 
 WebInspector.ElementsPanelFactory.prototype = {
     /**
      * @return {!WebInspector.Panel}
      */
     createPanel: function()
     {
         return WebInspector.ElementsPanel.instance();
     }
 }
+
+/**
+ * @constructor
+ * @implements {WebInspector.ActionDelegate}
+ */
+WebInspector.ElementsPanel.UndoActionDelegate = function()
+{
+}
+
+WebInspector.ElementsPanel.UndoActionDelegate.prototype = {
+    /**
+     * @return {boolean}
+     */
+    handleAction: function()
+    {
+        var panel = WebInspector.ElementsPanel.instance();
+        panel._undo();
+        return true;
+    }
+}
+
+/**
+ * @constructor
+ * @implements {WebInspector.ActionDelegate}
+ */
+WebInspector.ElementsPanel.RedoActionDelegate = function()
+{
+}
+
+WebInspector.ElementsPanel.RedoActionDelegate.prototype = {
+    /**
+     * @return {boolean}
+     */
+    handleAction: function()
+    {
+        var panel = WebInspector.ElementsPanel.instance();
+        panel._redo();
+        return true;
+    }
+}
+