jenkins-bot has submitted this change and it was merged.

Change subject: Delete cookie for current tour if isSinglePage, on onShow
......................................................................


Delete cookie for current tour if isSinglePage, on onShow

This allows server-side launch (by cookie) of single-page tours.

Bug: T108266
Change-Id: I4beb3abe49b7c5b1047d0200036d11c0c8541937
---
M modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
1 file changed, 5 insertions(+), 2 deletions(-)

Approvals:
  Mooeypoo: Looks good to me, approved
  Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js 
b/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
index 66970ff..27a539a 100644
--- a/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
+++ b/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
@@ -624,8 +624,11 @@
                var tourInfo = gt.parseTourId( guider.id ), priorCurrentStep,
                        handleLinkClickProxy = $.proxy( this.handleLinkClick, 
this );
 
-               //If this is not part of a single-page tour, save the guider id 
to a cookie
-               if ( !this.tour.isSinglePage ) {
+               // We delete the cookie to allow the server to launch 
single-page
+               // tours by cookie.
+               if ( this.tour.isSinglePage ) {
+                       gt.removeTourFromUserStateByGuider( guider );
+               } else {
                        gt.updateUserStateForTour( {
                                tourInfo: tourInfo,
                                wasShown: true

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4beb3abe49b7c5b1047d0200036d11c0c8541937
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/GuidedTour
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <mflasc...@wikimedia.org>
Gerrit-Reviewer: Mooeypoo <mor...@gmail.com>
Gerrit-Reviewer: Phuedx <g...@samsmith.io>
Gerrit-Reviewer: Swalling <steven.wall...@gmail.com>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to