Changeset 101314 in webkit

Timestamp:

Nov 28, 2011, 6:34:22 PM (15 years ago)

Author:

timothy@apple.com

Message:

Skip selecting TreeElements that are hidden when keyboard navigating.

We already skipped non-selectable tree elements in the common cases, this just makes selectable
take the hidden flag into account.

Reviewed by Brian Weinstein.

• inspector/front-end/treeoutline.js:

(TreeOutline.prototype._treeKeyDown): Skip non-selectable elements when pressing Left or Right,
similar to what we already do when pressing Up and Down.
(TreeElement): Set _selectable to true.
(TreeElement.prototype.get selectable): Added. Return false when hidden.
(TreeElement.prototype.set selectable): Added. Set _selectable.
(TreeElement.prototype.traverseNextTreeElement): Renamed skipHidden to skipUnrevealed to prevent confusion with
the hidden property of TreeElement.
(TreeElement.prototype.traversePreviousTreeElement): Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/treeoutline.js (modified) (9 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-28  Timothy Hatcher  <timothy@apple.com>
+
+        Skip selecting TreeElements that are hidden when keyboard navigating.
+
+        We already skipped non-selectable tree elements in the common cases, this just makes selectable
+        take the hidden flag into account.
+
+        Reviewed by Brian Weinstein.
+
+        * inspector/front-end/treeoutline.js:
+        (TreeOutline.prototype._treeKeyDown): Skip non-selectable elements when pressing Left or Right,
+        similar to what we already do when pressing Up and Down.
+        (TreeElement): Set _selectable to true.
+        (TreeElement.prototype.get selectable): Added. Return false when hidden.
+        (TreeElement.prototype.set selectable): Added. Set _selectable.
+        (TreeElement.prototype.traverseNextTreeElement): Renamed skipHidden to skipUnrevealed to prevent confusion with
+        the hidden property of TreeElement.
+        (TreeElement.prototype.traversePreviousTreeElement): Ditto.
+
 2011-11-28  Timothy Hatcher  <timothy@apple.com>
 

trunk/Source/WebCore/inspector/front-end/treeoutline.js

@@ -379 +379 @@
             if (this.selectedTreeElement.parent.selectable) {
                 nextSelectedElement = this.selectedTreeElement.parent;
+                while (nextSelectedElement && !nextSelectedElement.selectable)
+                    nextSelectedElement = nextSelectedElement.parent;
                 handled = nextSelectedElement ? true : false;
             } else if (this.selectedTreeElement.parent)
@@ -391 +393 @@
             if (this.selectedTreeElement.expanded) {
                 nextSelectedElement = this.selectedTreeElement.children[0];
+                while (nextSelectedElement && !nextSelectedElement.selectable)
+                    nextSelectedElement = nextSelectedElement.nextSibling;
                 handled = nextSelectedElement ? true : false;
             } else {
@@ -469 +473 @@
 
     this._hidden = false;
+    this._selectable = true;
     this.expanded = false;
     this.selected = false;
@@ -481 +486 @@
 
 TreeElement.prototype = {
-    selectable: true,
     arrowToggleWidth: 10,
+
+    get selectable() {
+        if (this._hidden)
+            return false;
+        return this._selectable;
+    },
+
+    set selectable(x) {
+        this._selectable = x;
+    },
 
     get listItemElement() {
@@ -889 +903 @@
 
 /**
- * @param {boolean} skipHidden
+ * @param {boolean} skipUnrevealed
  * @param {(TreeOutline|TreeElement)=} stayWithin
  * @param {boolean=} dontPopulate
@@ -895 +909 @@
  * @return {TreeElement}
  */
-TreeElement.prototype.traverseNextTreeElement = function(skipHidden, stayWithin, dontPopulate, info)
+TreeElement.prototype.traverseNextTreeElement = function(skipUnrevealed, stayWithin, dontPopulate, info)
 {
     if (!dontPopulate && this.hasChildren)
@@ -903 +917 @@
         info.depthChange = 0;
 
-    var element = skipHidden ? (this.revealed() ? this.children[0] : null) : this.children[0];
-    if (element && (!skipHidden || (skipHidden && this.expanded))) {
+    var element = skipUnrevealed ? (this.revealed() ? this.children[0] : null) : this.children[0];
+    if (element && (!skipUnrevealed || (skipUnrevealed && this.expanded))) {
         if (info)
             info.depthChange = 1;
@@ -913 +927 @@
         return null;
 
-    element = skipHidden ? (this.revealed() ? this.nextSibling : null) : this.nextSibling;
+    element = skipUnrevealed ? (this.revealed() ? this.nextSibling : null) : this.nextSibling;
     if (element)
         return element;
 
     element = this;
-    while (element && !element.root && !(skipHidden ? (element.revealed() ? element.nextSibling : null) : element.nextSibling) && element.parent !== stayWithin) {
+    while (element && !element.root && !(skipUnrevealed ? (element.revealed() ? element.nextSibling : null) : element.nextSibling) && element.parent !== stayWithin) {
         if (info)
             info.depthChange -= 1;
@@ -927 +941 @@
         return null;
 
-    return (skipHidden ? (element.revealed() ? element.nextSibling : null) : element.nextSibling);
+    return (skipUnrevealed ? (element.revealed() ? element.nextSibling : null) : element.nextSibling);
 }
 
 /**
- * @param {boolean} skipHidden
+ * @param {boolean} skipUnrevealed
  * @param {boolean=} dontPopulate
  * @return {TreeElement}
  */
-TreeElement.prototype.traversePreviousTreeElement = function(skipHidden, dontPopulate)
-{
-    var element = skipHidden ? (this.revealed() ? this.previousSibling : null) : this.previousSibling;
+TreeElement.prototype.traversePreviousTreeElement = function(skipUnrevealed, dontPopulate)
+{
+    var element = skipUnrevealed ? (this.revealed() ? this.previousSibling : null) : this.previousSibling;
     if (!dontPopulate && element && element.hasChildren)
         element.onpopulate();
 
-    while (element && (skipHidden ? (element.revealed() && element.expanded ? element.children[element.children.length - 1] : null) : element.children[element.children.length - 1])) {
+    while (element && (skipUnrevealed ? (element.revealed() && element.expanded ? element.children[element.children.length - 1] : null) : element.children[element.children.length - 1])) {
         if (!dontPopulate && element.hasChildren)
             element.onpopulate();
-        element = (skipHidden ? (element.revealed() && element.expanded ? element.children[element.children.length - 1] : null) : element.children[element.children.length - 1]);
+        element = (skipUnrevealed ? (element.revealed() && element.expanded ? element.children[element.children.length - 1] : null) : element.children[element.children.length - 1]);
     }