Mattflaschen has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/74126


Change subject: Always hide old guiders if skipping.
......................................................................

Always hide old guiders if skipping.

Change-Id: Iab416073694e45e8957b2b30ef489f3eca1b65c0
---
M guiders.js
1 file changed, 8 insertions(+), 9 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GuidedTour/guiders 
refs/changes/26/74126/1

diff --git a/guiders.js b/guiders.js
index 9c7fa4d..3148129 100644
--- a/guiders.js
+++ b/guiders.js
@@ -597,11 +597,8 @@
    Skips as needed then updates the displayed guider
 
    If it does skip:
-   * If it lands on a guider, it shows it.
-   * However, if it skips past the last one,
-     it hides all guiders.
-
-     This case occurs if shouldSkip returns true on the last guider.
+   * It hides all currently showing guiders.
+   * If it lands on a new guider, it shows that.
 
    The startGuider parameter is optional and defaults to the guider
    corresponding to guiders._currentGuiderID
@@ -609,7 +606,7 @@
    Returns true if it skipped, false otherwise
   */
   guiders.skipThenUpdateDisplay = function(startGuider) {
-    var endGuider, skipped;
+    var endGuider, skipped, omitHidingOverlay;
 
     if (startGuider === undefined) {
       if (guiders._currentGuiderID === null ) {
@@ -622,10 +619,12 @@
 
     skipped = endGuider !== startGuider;
     if (skipped) {
-        if (endGuider === undefined) {
-          guiders.hideAll();
-        } else {
+        if (endGuider !== undefined) {
+          omitHidingOverlay = endGuider.overlay ? true : false;
+          guiders.hideAll(omitHidingOverlay, true);
           guiders.show(endGuider.id);
+        } else {
+          guiders.hideAll();
         }
     }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab416073694e45e8957b2b30ef489f3eca1b65c0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GuidedTour/guiders
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <mflasc...@wikimedia.org>

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

Reply via email to