Cicalese has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380909 )

Change subject: Fixed jiggling on mouseout when graph is already at rest.
......................................................................

Fixed jiggling on mouseout when graph is already at rest.

Change-Id: Icfd127625a836977cc977ef5dd900f4e3c7373d1
---
M resources/PhabTaskGraph.js
1 file changed, 19 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PhabTaskGraph 
refs/changes/09/380909/1

diff --git a/resources/PhabTaskGraph.js b/resources/PhabTaskGraph.js
index c41a78c..fe991a9 100644
--- a/resources/PhabTaskGraph.js
+++ b/resources/PhabTaskGraph.js
@@ -146,13 +146,17 @@
                                        }
                                });
 
-                       var stop_tooltip = false;
-                       var stop_drag = false;
+                       var displaying_tooltip = false;
+                       var dragging = false;
+                       var paused = false;
 
                        node
                                .on('mouseover', function (d) {
-                                       stop_tooltip = true;
-                                       force.stop();
+                                       displaying_tooltip = true;
+                                       if (force.alpha()) {
+                                               force.stop();
+                                               paused = true;
+                                       }
                                        tooltip
                                                .transition()
                                                .duration(200)
@@ -165,9 +169,10 @@
 
                        node
                                .on('mouseout', function (d) {
-                                       stop_tooltip = false;
-                                       if (!stop_drag) {
+                                       displaying_tooltip = false;
+                                       if (!dragging && paused) {
                                                force.resume();
+                                               paused = false;
                                        }
                                        tooltip
                                                .transition()
@@ -182,8 +187,11 @@
                        drag
                                .on('dragstart', function (d) {
                                        d3.event.sourceEvent.stopPropagation();
-                                       stop_drag = true;
-                                       force.stop();
+                                       dragging = true;
+                                       if (force.alpha()) {
+                                               force.stop();
+                                               paused = true;
+                                       }
                                });
 
                        drag
@@ -201,10 +209,9 @@
                                                d.fixed = !d.fixed;
                                        }
                                        tick();
-                                       stop_drag = false;
-                                       if (!stop_tooltip) {
-                                               force.resume();
-                                       }
+                                       dragging = false;
+                                       force.resume();
+                                       paused = false;
                                });
 
                        node

-- 
To view, visit https://gerrit.wikimedia.org/r/380909
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icfd127625a836977cc977ef5dd900f4e3c7373d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PhabTaskGraph
Gerrit-Branch: master
Gerrit-Owner: Cicalese <cin...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to