From 6f00b110c711c70933a3a1a7999bfba42d7ae438 Mon Sep 17 00:00:00 2001 From: Gordon Koo Date: Mon, 15 Apr 2013 14:45:09 -0700 Subject: [PATCH] check backwards-direction multipage, for when onPrev wants to go to previous page --- js/hopscotch-0.0.5.js | 12 +++++--- js/hopscotch-0.0.5.min.js | 60 +++++++++++++++++++-------------------- 2 files changed, 38 insertions(+), 34 deletions(-) diff --git a/js/hopscotch-0.0.5.js b/js/hopscotch-0.0.5.js index 893f3b82..5d66eefc 100644 --- a/js/hopscotch-0.0.5.js +++ b/js/hopscotch-0.0.5.js @@ -1517,7 +1517,12 @@ doCallbacks = utils.valOrDefault(doCallbacks, true); step = getCurrStep(); origStep = step; - wasMultiPage = step.multipage; + if (direction > 0) { + wasMultiPage = origStep.multipage; + } + else { + wasMultiPage = (currStepNum > 0 && currTour.steps[currStepNum-1].multipage); + } /** * Callback for goToStepWithTarget @@ -1538,9 +1543,8 @@ utils.invokeEventCallbacks('prev', origStep.onPrev); } - if (direction > 0 && wasMultiPage) { - // Next step is on a different page, so no need to attempt to - // render it. + if (wasMultiPage) { + // Next step is on a different page, so no need to attempt to render it. return; } } diff --git a/js/hopscotch-0.0.5.min.js b/js/hopscotch-0.0.5.min.js index 66076bea..80551b67 100644 --- a/js/hopscotch-0.0.5.min.js +++ b/js/hopscotch-0.0.5.min.js @@ -1,36 +1,36 @@ -(function(z,E){var p,A,F,n,G=window.Sizzle||null,b,s,x,t,m=z[E],H=!1,u={animate:!1,smoothScroll:!0,scrollDuration:1E3,scrollTopMargin:200,showCloseButton:!0,showPrevButton:!1,showNextButton:!0,bubbleWidth:280,bubblePadding:15,arrowWidth:20,skipIfNoElement:!0},C="undefined"!==typeof window.jQuery,v="undefined"!==typeof window.sessionStorage,f=window.document;m||(Array.isArray||(Array.isArray=function(a){return"[object Array]"===Object.prototype.toString.call(a)}),p=function(){H&&m.startTour()},window.addEventListener? -window.addEventListener("load",p,!1):window.attachEvent&&window.attachEvent("onload",p),b={addClass:function(a,e){var b,d,h;if(0===a.className.length)a.className=e;else{b=a.className.split(/\s+/);d=0;for(h=b.length;dg||g>=j.steps.length?null:j.steps[g]},t=function(){e.nextStep(!1)},v=function(a,c){var d,h;0<=g+a&& -g+ae?d:e,g=b.getScrollTop(), -e=g+b.getWindowHeight(),q=a-h.scrollTopMargin,B,j,w;a>=g&&(a<=g+h.scrollTopMargin||d<=e)?i&&i():h.smoothScroll?"undefined"!==typeof YAHOO&&"undefined"!==typeof YAHOO.env&&"undefined"!==typeof YAHOO.env.ua&&"undefined"!==typeof YAHOO.util&&"undefined"!==typeof YAHOO.util.Scroll?(a=YAHOO.env.ua.webkit?f.body:f.documentElement,d=YAHOO.util.Easing?YAHOO.util.Easing.easeOut:void 0,a=new YAHOO.util.Scroll(a,{scroll:{to:[0,q]}},h.scrollDuration/1E3,d),a.onComplete.subscribe(i),a.animate()):C?$("body, html").animate({scrollTop:q}, -h.scrollDuration,i):(0>q&&(q=0),B=g>a?-1:1,j=Math.abs(g-q)/(h.scrollDuration/10),w=function(){var a=b.getScrollTop(),c=a+B*j;0=q||0>B&&c<=q?(c=q,i&&i(),window.scrollTo(0,c)):(window.scrollTo(0,c),b.getScrollTop()===a?i&&i():setTimeout(w,10))},w()):(window.scrollTo(0,q),i&&i())}else i();c.nextOnTargetClick&&b.addClickListener(k,t)});c.multipage&&(e+=":mp");b.setState(h.cookieName,e,1)},c.delay||0);return this};this.prevStep=function(a){z.call(this,a,-1);return this};this.nextStep=function(a){var c= -r(),d=b.getStepTarget(c);c.nextOnTargetClick&&b.removeClickListener(d,t);z.call(this,a,1);return this};this.endTour=function(a,c){var d=y(),a=b.valOrDefault(a,!0),c=b.valOrDefault(c,!0);g=0;i=void 0;d.hide();a&&b.clearState(h.cookieName);m.isActive=!1;j&&c&&b.invokeEventCallbacks("end");m.removeCallbacks(!0);j=null;return this};this.getCurrTour=function(){return j};this.getCurrStepNum=function(){return g};this.listen=function(a,b,c){a&&s[a].push({cb:b,fromTour:c});return this};this.unlisten=function(a, -b){var c=s[a],d,e;d=0;for(e=c.length;df||f>=i.steps.length?null:i.steps[f]},t=function(){e.nextStep(!1)},v=function(a,c){var d,h;0<=f+a&& +f+ae?d:e,f=b.getScrollTop(),e=f+b.getWindowHeight(),q=a-h.scrollTopMargin,i,H,w;a>=f&&(a<=f+h.scrollTopMargin||d<=e)?j&&j():h.smoothScroll?"undefined"!==typeof YAHOO&&"undefined"!==typeof YAHOO.env&&"undefined"!==typeof YAHOO.env.ua&&"undefined"!==typeof YAHOO.util&&"undefined"!==typeof YAHOO.util.Scroll?(a=YAHOO.env.ua.webkit?g.body:g.documentElement,d=YAHOO.util.Easing?YAHOO.util.Easing.easeOut:void 0,a=new YAHOO.util.Scroll(a,{scroll:{to:[0,q]}},h.scrollDuration/1E3,d),a.onComplete.subscribe(j), +a.animate()):B?$("body, html").animate({scrollTop:q},h.scrollDuration,j):(0>q&&(q=0),i=f>a?-1:1,H=Math.abs(f-q)/(h.scrollDuration/10),w=function(){var a=b.getScrollTop(),c=a+i*H;0=q||0>i&&c<=q?(c=q,j&&j(),window.scrollTo(0,c)):(window.scrollTo(0,c),b.getScrollTop()===a?j&&j():setTimeout(w,10))},w()):(window.scrollTo(0,q),j&&j())}else j();c.nextOnTargetClick&&b.addClickListener(k,t)});c.multipage&&(e+=":mp");b.setState(h.cookieName,e,1)},c.delay||0);return this};this.prevStep=function(a){z.call(this, +a,-1);return this};this.nextStep=function(a){var c=r(),d=b.getStepTarget(c);c.nextOnTargetClick&&b.removeClickListener(d,t);z.call(this,a,1);return this};this.endTour=function(a,c){var d=y(),a=b.valOrDefault(a,!0),c=b.valOrDefault(c,!0);f=0;j=void 0;d.hide();a&&b.clearState(h.cookieName);m.isActive=!1;i&&c&&b.invokeEventCallbacks("end");m.removeCallbacks(!0);i=null;return this};this.getCurrTour=function(){return i};this.getCurrStepNum=function(){return f};this.listen=function(a,b,c){a&&s[a].push({cb:b, +fromTour:c});return this};this.unlisten=function(a,b){var c=s[a],d,e;d=0;for(e=c.length;d