Changeset 200995 in webkit

Timestamp:

May 16, 2016 9:11:41 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Uncaught Exception: TypeError: null is not an object (evaluating 'event.data.pathComponent.domTreeElement')
​https://bugs.webkit.org/show_bug.cgi?id=157759
<rdar://problem/26309427>

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2016-05-16
Reviewed by Timothy Hatcher.

• UserInterface/Views/DOMTreeContentView.js:

(WebInspector.DOMTreeContentView.prototype._pathComponentSelected):
Handle possible null path components.

• UserInterface/Views/HierarchicalPathComponent.js:

(WebInspector.HierarchicalPathComponent.prototype.get selectedPathComponent):
When there is a list of just one that is triggered, the Clicked
event should produce that one, to be consistent with clicking
on a list of multiple elements and selecting the same value.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/DOMTreeContentView.js (modified) (1 diff)
• UserInterface/Views/HierarchicalPathComponent.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2016-05-16  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Uncaught Exception: TypeError: null is not an object (evaluating 'event.data.pathComponent.domTreeElement')
+        https://bugs.webkit.org/show_bug.cgi?id=157759
+        <rdar://problem/26309427>
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Views/DOMTreeContentView.js:
+        (WebInspector.DOMTreeContentView.prototype._pathComponentSelected):
+        Handle possible null path components.
+
+        * UserInterface/Views/HierarchicalPathComponent.js:
+        (WebInspector.HierarchicalPathComponent.prototype.get selectedPathComponent):
+        When there is a list of just one that is triggered, the Clicked
+        event should produce that one, to be consistent with clicking
+        on a list of multiple elements and selecting the same value.
+
 2016-05-16  Saam barati  <sbarati@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js

@@ -372 +372 @@
     _pathComponentSelected(event)
     {
+        if (!event.data.pathComponent)
+            return;
+
         console.assert(event.data.pathComponent instanceof WebInspector.DOMTreeElementPathComponent);
         console.assert(event.data.pathComponent.domTreeElement instanceof WebInspector.DOMTreeElement);

trunk/Source/WebInspectorUI/UserInterface/Views/HierarchicalPathComponent.js

@@ -87 +87 @@
     get selectedPathComponent()
     {
-        var selectElement = this._selectElement[this._selectElement.selectedIndex];
-        return selectElement && selectElement._pathComponent || null;
+        let selectedOption = this._selectElement[this._selectElement.selectedIndex];
+        if (!selectedOption && this._selectElement.options.length === 1)
+            selectedOption = this._selectElement.options[0];
+        return selectedOption && selectedOption._pathComponent || null;
     }