Changeset 31009 in webkit

Timestamp:

Mar 12, 2008 4:00:00 PM (16 years ago)

Author:

Adam Roben

Message:

Part of Bug 17224: DOM nodes/attributes should be editable

<​http://bugs.webkit.org/show_bug.cgi?id=17224>
<rdar://problem/5732825>

We now start editing if the user single-clicks on an attribute,
attribute value, or text node while the parent element is selected.
Previously, we started editing on double-click regardless of the
selection state of the element.

URLs in the DOM tree are now followed on Alt/Option-click, rather than
on just click.

Reviewed by Tim.

• English.lproj/InspectorLocalizedStrings.js: Added four new localized strings.
• page/inspector/DocumentPanel.js: (WebInspector.DOMNodeTreeElement.onattach): Call new _makeURLSActivateOnModifiedClick. (WebInspector.DOMNodeTreeElement._makeURLsActivateOnModifiedClick): Added. Changes the tooltip of each link in this element to indicate that Alt/Option-click will follow the URL, and sets the followOnAltClick property on each link. (WebInspector.DOMNodeTreeElement.onselect): Mark that we're being selected. (WebInspector.DOMNodeTreeElement.onmousedown): If we're not currently being selected, start editing. (WebInspector.DOMNodeTreeElement.ondblclick): We no longer start editing here. We block re-rooting of the tree if we're currently editing. (WebInspector.DOMNodeTreeElement._startEditing):
  • Don't do anything if we're not focused
  • Pass the event down to _startEditingAttribute.

(WebInspector.DOMNodeTreeElement._startEditingAttribute): Don't do
anything if the event target is a URL and the Alt/Option key is
pressed -- in this case we want to follow the link.
(WebInspector.DOMNodeTreeElement._updateTitle): Call
_makeURLsActivateOnClick again since the anchor elements have all been
recreated.

• page/inspector/inspector.js: (WebInspector.documentClick): If the anchor as a followOnAltClick property and the Alt/Option key is not pressed, do nothing.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• English.lproj/InspectorLocalizedStrings.js (modified) (2 diffs)
• page/inspector/DocumentPanel.js (modified) (8 diffs)
• page/inspector/inspector.js (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-03-12  Adam Roben  <aroben@apple.com>
+
+        Part of Bug 17224: DOM nodes/attributes should be editable
+
+        <http://bugs.webkit.org/show_bug.cgi?id=17224>
+        <rdar://problem/5732825>
+
+        We now start editing if the user single-clicks on an attribute,
+        attribute value, or text node while the parent element is selected.
+        Previously, we started editing on double-click regardless of the
+        selection state of the element.
+
+        URLs in the DOM tree are now followed on Alt/Option-click, rather than
+        on just click.
+
+        Reviewed by Tim.
+
+        * English.lproj/InspectorLocalizedStrings.js: Added four new localized
+        strings.
+        * page/inspector/DocumentPanel.js:
+        (WebInspector.DOMNodeTreeElement.onattach): Call new
+        _makeURLSActivateOnModifiedClick.
+        (WebInspector.DOMNodeTreeElement._makeURLsActivateOnModifiedClick):
+        Added. Changes the tooltip of each link in this element to indicate
+        that Alt/Option-click will follow the URL, and sets the
+        followOnAltClick property on each link.
+        (WebInspector.DOMNodeTreeElement.onselect): Mark that we're being
+        selected.
+        (WebInspector.DOMNodeTreeElement.onmousedown): If we're not currently
+        being selected, start editing.
+        (WebInspector.DOMNodeTreeElement.ondblclick): We no longer start
+        editing here. We block re-rooting of the tree if we're currently
+        editing.
+        (WebInspector.DOMNodeTreeElement._startEditing):
+          - Don't do anything if we're not focused
+          - Pass the event down to _startEditingAttribute.
+        (WebInspector.DOMNodeTreeElement._startEditingAttribute): Don't do
+        anything if the event target is a URL and the Alt/Option key is
+        pressed -- in this case we want to follow the link.
+        (WebInspector.DOMNodeTreeElement._updateTitle): Call
+        _makeURLsActivateOnClick again since the anchor elements have all been
+        recreated.
+        * page/inspector/inspector.js:
+        (WebInspector.documentClick): If the anchor as a followOnAltClick
+        property and the Alt/Option key is not pressed, do nothing.
+
 2008-03-12  Ada Chan  <adachan@apple.com>
 

trunk/WebCore/English.lproj/InspectorLocalizedStrings.js

@@ -5 +5 @@
     "(text)": "(text)",
     "(whitespace)": "(whitespace)",
+    "Alt-click to visit %s.": "Alt-click to visit %s.",
+    "Alt-click to show %s.": "Alt-click to show %s.",
     "An error occurred trying to\nread the “%s” table.": "An error occurred trying to\nread the “%s” table.",
     "An unexpected error %s occured.": "An unexpected error %s occured.",
@@ -19 +21 @@
     "Metrics": "Metrics",
     "Network": "Network",
+    "Option-click to visit %s.": "Option-click to visit %s.",
+    "Option-click to show %s.": "Option-click to show %s.",
     "Properties": "Properties",
     "Prototype": "Prototype",

trunk/WebCore/page/inspector/DocumentPanel.js

@@ -770 +770 @@
     {
         this.listItemElement.addEventListener("mousedown", this.onmousedown.bind(this), false);
+
+        this._makeURLsActivateOnModifiedClick();
+    },
+
+    _makeURLsActivateOnModifiedClick: function()
+    {
+        var links = this.listItemElement.querySelectorAll("li > .webkit-html-tag > .webkit-html-attribute > .webkit-html-external-link, li > .webkit-html-tag > .webkit-html-attribute > .webkit-html-resource-link");
+        if (!links)
+            return;
+
+        var isMac = InspectorController.platform().indexOf("mac") == 0;
+
+        for (var i = 0; i < links.length; ++i) {
+            var link = links[i];
+            var isExternal = link.hasStyleClass("webkit-html-external-link");
+            var href = link.getAttribute("href");
+            var title;
+            if (isMac) {
+                if (isExternal)
+                    title = WebInspector.UIString("Option-click to visit %s.", href);
+                else
+                    title = WebInspector.UIString("Option-click to show %s.", href);
+            } else {
+                if (isExternal)
+                    title = WebInspector.UIString("Alt-click to visit %s.", href);
+                else
+                    title = WebInspector.UIString("Alt-click to show %s.", href);
+            }
+            link.setAttribute("title", title);
+            link.followOnAltClick = true;
+        }
     },
 
@@ -812 +843 @@
     onselect: function()
     {
+        this._selectedByCurrentMouseDown = true;
         this.treeOutline.panel.focusedDOMNode = this.representedObject;
         this.updateSelection();
@@ -820 +852 @@
         if (this._editing)
             return;
+
+        if (this._selectedByCurrentMouseDown)
+            delete this._selectedByCurrentMouseDown;
+        else if (this._startEditing(event)) {
+            event.preventDefault();
+            return;
+        }
 
         // Prevent selecting the nearest word on double click.
@@ -828 +867 @@
     ondblclick: function(treeElement, event)
     {
-        if (this._startEditing(event))
+        if (this._editing)
             return;
 
@@ -841 +880 @@
     _startEditing: function(event)
     {
+        if (this.treeOutline.panel.focusedDOMNode != this.representedObject)
+            return;
+
         if (this.representedObject.nodeType != Node.ELEMENT_NODE && this.representedObject.nodeType != Node.TEXT_NODE)
             return false;
@@ -850 +892 @@
         var attribute = event.target.firstParentOrSelfWithClass("webkit-html-attribute");
         if (attribute)
-            return this._startEditingAttribute(attribute);
+            return this._startEditingAttribute(attribute, event);
 
         return false;
     },
 
-    _startEditingAttribute: function(attribute)
+    _startEditingAttribute: function(attribute, event)
     {
         if (WebInspector.isBeingEdited(attribute))
@@ -862 +904 @@
         var attributeNameElement = attribute.getElementsByClassName("webkit-html-attribute-name")[0];
         if (!attributeNameElement)
+            return false;
+
+        var isURL = event.target.firstParentOrSelfWithClass("webkit-html-external-link") || event.target.firstParentOrSelfWithClass("webkit-html-resource-link");
+        if (isURL && event.altKey)
             return false;
 
@@ -958 +1004 @@
         delete this.selectionElement;
         this.updateSelection();
+        this._makeURLsActivateOnModifiedClick();
     },
 }

trunk/WebCore/page/inspector/inspector.js

@@ -329 +329 @@
 {
     var anchor = event.target.firstParentOrSelfWithNodeName("a");
-    if (!anchor || !anchor.hasStyleClass("webkit-html-resource-link"))
+    if (!anchor)
+        return;
+
+    if (anchor.followOnAltClick && !event.altKey) {
+        event.preventDefault();
+        return;
+    }
+
+    if (!anchor.hasStyleClass("webkit-html-resource-link"))
         return;