Changeset 113428 in webkit

Timestamp:

Apr 6, 2012, 5:49:55 AM (13 years ago)

Author:

caseq@chromium.org

Message:

Web Inspector: hide popover on mouseout from anchor
​https://bugs.webkit.org/show_bug.cgi?id=83362

Reviewed by Pavel Feldman.

• start hide popover timer when mouse moves out of popover anchor, as we won't receive mousemove events any more;
• factored out starting of popover kill timer to a method.

• inspector/front-end/Popover.js:

(WebInspector.PopoverHelper):
(WebInspector.PopoverHelper.prototype._mouseMove): Factored out StartHidePopoverTimer()
(WebInspector.PopoverHelper.prototype._mouseOut): Just call StartHidePopoverTimer() when mouse moves out of anchor.
(WebInspector.PopoverHelper.prototype._startHidePopoverTimer.doHide):
(WebInspector.PopoverHelper.prototype._startHidePopoverTimer):
(WebInspector.PopoverHelper.prototype._hidePopover): Reset hoverElement (aka anchor) when hiding popover.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/Popover.js (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-06  Andrey Kosyakov  <caseq@chromium.org>
+
+        Web Inspector: hide popover on mouseout from anchor
+        https://bugs.webkit.org/show_bug.cgi?id=83362
+
+        Reviewed by Pavel Feldman.
+
+        - start hide popover timer when mouse moves out of popover anchor, as we won't receive mousemove events any more;
+        - factored out starting of popover kill timer to a method.
+
+        * inspector/front-end/Popover.js:
+        (WebInspector.PopoverHelper):
+        (WebInspector.PopoverHelper.prototype._mouseMove): Factored out StartHidePopoverTimer()
+        (WebInspector.PopoverHelper.prototype._mouseOut): Just call StartHidePopoverTimer() when mouse moves out of anchor.
+        (WebInspector.PopoverHelper.prototype._startHidePopoverTimer.doHide): 
+        (WebInspector.PopoverHelper.prototype._startHidePopoverTimer):
+        (WebInspector.PopoverHelper.prototype._hidePopover): Reset hoverElement (aka anchor) when hiding popover.
+
 2012-04-06  Andrey Kosyakov  <caseq@chromium.org>
 

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

@@ -206 +206 @@
     panelElement.addEventListener("mousedown", this._mouseDown.bind(this), false);
     panelElement.addEventListener("mousemove", this._mouseMove.bind(this), false);
+    panelElement.addEventListener("mouseout", this._mouseOut.bind(this), false);
     this.setTimeout(1000);
 }
@@ -231 +232 @@
             return;
 
+        this._startHidePopoverTimer();
+        this._handleMouseAction(event, false);
+    },
+
+    _mouseOut: function(event)
+    {
+        if (event.target === this._hoverElement)
+            this._startHidePopoverTimer();
+    },
+
+    _startHidePopoverTimer: function()
+    {
         // User has 500ms (this._timeout / 2) to reach the popup.
-        if (this._popover && !this._hidePopoverTimer) {
-            var self = this;
-            function doHide()
-            {
-                self._hidePopover();
-                delete self._hidePopoverTimer;
-            }
-            this._hidePopoverTimer = setTimeout(doHide, this._timeout / 2);
-        }
-
-        this._handleMouseAction(event, false);
+        if (!this._popover || this._hidePopoverTimer)
+            return;
+
+        function doHide()
+        {
+            this._hidePopover();
+            delete this._hidePopoverTimer;
+        }
+        this._hidePopoverTimer = setTimeout(doHide.bind(this), this._timeout / 2);
     },
 
@@ -286 +297 @@
         this._popover.dispose();
         delete this._popover;
+        this._hoverElement = null;
     },