Robmoen has uploaded a new change for review.

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

Change subject: Fix issue with automatic next button when there is an okay 
button.
......................................................................

Fix issue with automatic next button when there is an okay button.

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GuidedTour 
refs/changes/34/142434/1

diff --git a/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js 
b/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
index 0d65ff8..4190ec8 100644
--- a/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
+++ b/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
@@ -396,11 +396,6 @@
                        backButton = this.getActionButton( 'back', back );
                }
 
-               // Auto add a next button if the next callback is defined.
-               if ( this.hasCallback( 'next' ) && nextButton === undefined ) {
-                       nextButton = this.getActionButton( 'next', next );
-               }
-
                if ( allowAutomaticOkay ) {
                        // Ensure there is always an okay and/or next button.  
In some cases, there will not be
                        // a next, since the user is prompted to do something 
else
@@ -412,6 +407,11 @@
                        }
                }
 
+               // Auto add a next button if the next callback is defined.
+               if ( this.hasCallback( 'next' ) && nextButton === undefined && 
okayButton === undefined ) {
+                       nextButton = this.getActionButton( 'next', next );
+               }
+
                if ( backButton !== undefined ) {
                        guiderButtons.push( backButton );
                }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0419a699de722ff4d7f0839a2444bf180d441181
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GuidedTour
Gerrit-Branch: master
Gerrit-Owner: Robmoen <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to