DevTools: Reimplemented WI.WatchExpressionsSidebarPane

Source/devtools/front_end/components/ObjectPropertiesSection.js

 /*

[pfeldman, 2015/02/18 20:51:00]

Looks like you can simply land changes in this file separately.

[sergeyv, 2015/02/19 10:53:46]

Unfortunately, It will break watch expressions

  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * 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
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 148 matching lines @@
         console.assert(propertyValue);
         WebInspector.ObjectPropertyTreeElement.populate(this, propertyValue);
     },
 
     /**
      * @override
      * @return {boolean}
      */
     ondblclick: function(event)
     {
-        var editableElement = this.elementAndValueToEdit().element;
+        var editableElement = this.valueElement;
         if ((this.property.writable || this.property.setter) && event.target.isSelfOrDescendant(editableElement))
             this.startEditing(event);
         return false;
     },
 
     /**
      * @override
      */
     onattach: function()
     {
@@ skipping 25 matching lines @@
         var separatorElement = createElementWithClass("span", "separator");
         separatorElement.textContent = ": ";
 
         this.listItemElement.removeChildren();
         this.listItemElement.appendChildren(this.nameElement, separatorElement, this.valueElement);
     },
 
     _contextMenuFired: function(value, event)
     {
         var contextMenu = new WebInspector.ContextMenu(event);
-        this.populateContextMenu(contextMenu);
         contextMenu.appendApplicableItems(value);
         contextMenu.show();
     },
 
     /**
      * @param {!WebInspector.ContextMenu} contextMenu
      */
     populateContextMenu: function(contextMenu)

[pfeldman, 2015/02/18 20:51:00]

Remove this?

[sergeyv, 2015/02/19 10:53:46]

Done.

     {
     },
 
     updateSiblings: function()
     {
         if (this.parent.root)
             this.treeOutline.section.update();
         else
             this.parent.shouldRefreshChildren = true;
     },
 
     /**
-     * @return {boolean}
-     */
-    renderPromptAsBlock: function()
-    {
-        return false;
-    },
-
-    /**
-     * @return {{element: !Element, value: (string|undefined)}}
-     */
-    elementAndValueToEdit: function()
-    {
-        return {
-            element: this.valueElement,
-            value: (typeof this.valueElement._originalTextContent === "string") ? this.valueElement._originalTextContent : undefined
-        };
-    },
-
-    /**
      * @param {!Event=} event
      */
     startEditing: function(event)
     {
-        var elementAndValueToEdit = this.elementAndValueToEdit();
-        var elementToEdit = elementAndValueToEdit.element;
-        var valueToEdit = elementAndValueToEdit.value;
+        var valueToEdit = (typeof this.valueElement._originalTextContent === "string") ? this.valueElement._originalTextContent : undefined;
 
-        if (WebInspector.isBeingEdited(elementToEdit) || !this.treeOutline.section.editable || this._readOnly)
+        if (WebInspector.isBeingEdited(this.valueElement) || !this.treeOutline.section.editable || this._readOnly)
             return;
 
         // Edit original source.
         if (typeof valueToEdit !== "undefined")
-            elementToEdit.setTextContentTruncatedIfNeeded(valueToEdit, WebInspector.UIString("<string is too large to edit>"));
+            this.valueElement.setTextContentTruncatedIfNeeded(valueToEdit, WebInspector.UIString("<string is too large to edit>"));
 
-        var context = { expanded: this.expanded, elementToEdit: elementToEdit, previousContent: elementToEdit.textContent };
+        var context = { expanded: this.expanded, previousContent: this.valueElement.textContent };
 
         // Lie about our children to prevent expanding on double click and to collapse subproperties.
         this.hasChildren = false;
 
         this.listItemElement.classList.add("editing-sub-part");
 
-        this._prompt = new WebInspector.ObjectPropertyPrompt(this.renderPromptAsBlock());
+        this._prompt = new WebInspector.ObjectPropertyPrompt();
 
         /**
          * @this {WebInspector.ObjectPropertyTreeElement}
          */
         function blurListener()
         {
-            this.editingCommitted(null, elementToEdit.textContent, context.previousContent, context);
+            this.editingCommitted(null, this.valueElement.textContent, context.previousContent, context);
         }
 
-        var proxyElement = this._prompt.attachAndStartEditing(elementToEdit, blurListener.bind(this));
-        this.listItemElement.getComponentSelection().setBaseAndExtent(elementToEdit, 0, elementToEdit, 1);
+        var proxyElement = this._prompt.attachAndStartEditing(this.valueElement, blurListener.bind(this));
+        this.listItemElement.getComponentSelection().setBaseAndExtent(this.valueElement, 0, this.valueElement, 1);
         proxyElement.addEventListener("keydown", this._promptKeyDown.bind(this, context), false);
     },
 
     /**
      * @return {boolean}
      */
     isEditing: function()
     {
         return !!this._prompt;
     },
@@ skipping 23 matching lines @@
         }
 
         this.editingEnded(context);
         this.applyExpression(userInput);
     },
 
     _promptKeyDown: function(context, event)
     {
         if (isEnterKey(event)) {
             event.consume(true);
-            this.editingCommitted(null, context.elementToEdit.textContent, context.previousContent, context);
+            this.editingCommitted(null, this.valueElement.textContent, context.previousContent, context);
             return;
         }
         if (event.keyIdentifier === "U+001B") { // Esc
             event.consume();
             this.editingCancelled(null, context);
             return;
         }
     },
 
     /**
@@ skipping 693 matching lines @@
     {
         this.listItemElement.classList.add("name");
     },
 
     __proto__: TreeElement.prototype
 }
 
 /**
  * @constructor
  * @extends {WebInspector.TextPrompt}
- * @param {boolean=} renderAsBlock
  */
-WebInspector.ObjectPropertyPrompt = function(renderAsBlock)
+WebInspector.ObjectPropertyPrompt = function()
 {
     WebInspector.TextPrompt.call(this, WebInspector.ExecutionContextSelector.completionsForTextPromptInCurrentContext);
     this.setSuggestBoxEnabled(true);
-    if (renderAsBlock)
-        this.renderAsBlock();
 }
 
 WebInspector.ObjectPropertyPrompt.prototype = {
     __proto__: WebInspector.TextPrompt.prototype
 }
 
 /**
  * @param {?string} name
  * @return {!Element}
  */
@@ skipping 73 matching lines @@
         value.highlightAsDOMNode();
     }
 
     function mouseLeave()
     {
         value.hideDOMNodeHighlight();
     }
 
     return valueElement;
 }