Mattflaschen has submitted this change and it was merged.
Change subject: Pass exact close method to onClose as new parameter.
......................................................................
Pass exact close method to onClose as new parameter.
Change-Id: I350b64c026da9324ed830404bbe81ffc57e0a5b6
---
M guiders.js
1 file changed, 6 insertions(+), 6 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
Mattflaschen: Verified
diff --git a/guiders.js b/guiders.js
index bb9f0ba..f6b745d 100644
--- a/guiders.js
+++ b/guiders.js
@@ -193,11 +193,11 @@
// Handles a user-initiated close action (e.g. clicking close or hitting ESC)
// isAlternativeClose is false for the text Close button, and true for
everything else.
- guiders.handleOnClose = function(myGuider, isAlternativeClose) {
+ guiders.handleOnClose = function(myGuider, isAlternativeClose, closeMethod) {
// Default to dismissing current step
var shouldEndTour = false;
if (myGuider.onClose) {
- shouldEndTour = myGuider.onClose(myGuider, isAlternativeClose);
+ shouldEndTour = myGuider.onClose(myGuider, isAlternativeClose,
closeMethod);
}
if (shouldEndTour) {
@@ -235,7 +235,7 @@
switch (thisButtonName) {
case guiders._closeButtonTitle.toLowerCase():
thisButtonElem.bind("click", function () {
- guiders.handleOnClose(myGuider, false /* close by button */);
+ guiders.handleOnClose(myGuider, false, 'textButton' /* close by
button */);
});
break;
case guiders._nextButtonTitle.toLowerCase():
@@ -269,14 +269,14 @@
"role" : "button" });
xButtonContainer.append(xButton);
xButton.click(function() {
- guiders.handleOnClose(myGuider, true);
+ guiders.handleOnClose(myGuider, true, 'xButton');
});
};
guiders._wireEscape = function (myGuider) {
$(document).keydown(function(event) {
if (event.keyCode == 27 || event.which == 27) {
- guiders.handleOnClose(myGuider, true /*close by X/Escape*/);
+ guiders.handleOnClose(myGuider, true, 'escapeKey' /*close by escape
key */);
return false;
}
});
@@ -289,7 +289,7 @@
guiders._wireClickOutside = function (myGuider) {
$(document).bind('click.guiders', function (event) {
if ($(event.target).closest(".guider").length === 0) {
- guiders.handleOnClose(myGuider, true /* close by clicking outside */);
+ guiders.handleOnClose(myGuider, true, 'clickOutside' /* close by
clicking outside */);
if (event.target.id === 'guider_overlay') {
return false;
}
--
To view, visit https://gerrit.wikimedia.org/r/63105
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I350b64c026da9324ed830404bbe81ffc57e0a5b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GuidedTour/guiders
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <[email protected]>
Gerrit-Reviewer: Mattflaschen <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Spage <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
