Merge pull request #146 from alejandroiglesias/patch-1

Add parameter to postStepCallback and postRideCallback to know if tour has been aborted
zurb · Dec 23, 2013 · 9685a1e · 9685a1e
2 parents 940a602 + 9065a85
commit 9685a1e
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/jquery.joyride-2.1.js b/jquery.joyride-2.1.js
@@ -129,7 +129,7 @@
 
             settings.$document.on('click.joyride', '.joyride-close-tip', function (e) {
               e.preventDefault();
-              methods.end();
+              methods.end(true /* isAborted */);
             });
 
             settings.$window.bind('resize.joyride', function (e) {
@@ -823,7 +823,8 @@
         }
       },
 
-      end : function () {
+      end : function (isAborted) {
+        isAborted = isAborted || false;
         if (settings.cookieMonster) {
           $.cookie(settings.cookieName, 'ridden', { expires: 365, domain: settings.cookieDomain, path: settings.cookiePath });
         }
@@ -842,8 +843,8 @@
           settings.$current_tip.hide();
         }
         if (settings.$li) {
-          settings.postStepCallback(settings.$li.index(), settings.$current_tip);
-          settings.postRideCallback(settings.$li.index(), settings.$current_tip);
+          settings.postStepCallback(settings.$li.index(), settings.$current_tip, isAborted);
+          settings.postRideCallback(settings.$li.index(), settings.$current_tip, isAborted);
         }
         $('.joyride-modal-bg').hide();
       },
@@ -885,7 +886,7 @@
               // Escape key.
               event.keyCode === 27 ) {
             event.preventDefault();
-            methods.end();
+            methods.end(true /* isAborted */);
             return;
           }