Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PreStep method #56

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

PreStep method #56

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3c156f
Added a prestep method to the constructor and to the show method.
shrinerp Dec 14, 2012
35cb653
Added a modal property to the step's settings to eliminate scrolling …
shrinerp Dec 18, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions jquery.joyride-2.0.2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
'use strict';

var defaults = {
'version' : '2.0.1',
'version' : '2.0.2',
'tipLocation' : 'bottom', // 'top' or 'bottom' in relation to parent
'nubPosition' : 'auto', // override on a per tooltip bases
'scrollSpeed' : 300, // Page scrolling speed in milliseconds
Expand All @@ -29,6 +29,8 @@
'tipContainer' : 'body', // Where will the tip be attached
'postRideCallback' : $.noop, // A method to call once the tour closes (canceled or complete)
'postStepCallback' : $.noop, // A method to call after each step
'preStepCallback' : $.noop, // A method to call before each step
'tipIsModal' : false,
'template' : { // HTML segments for tip layout
'link' : '<a href="#close" class="joyride-close-tip">X</a>',
'timer' : '<div class="joyride-timer-indicator-wrap"><span class="joyride-timer-indicator"></span></div>',
Expand Down Expand Up @@ -188,6 +190,9 @@
},

show : function (init) {
//call pre-step method to allow user to adjsut what is visible on screen.
settings.preStepCallback(init=="init"?0:(settings.$li.index()+1));

var opts = {}, ii, opts_arr = [], opts_len = 0, p,
$timer = null;

Expand Down Expand Up @@ -221,7 +226,7 @@
settings.tipSettings.tipLocationPattern = settings.tipLocationPatterns[settings.tipSettings.tipLocation];

// scroll if not modal
if (!/body/i.test(settings.$target.selector)) {
if (!/body/i.test(settings.$target.selector) ) {
methods.scroll_to();
}

Expand Down Expand Up @@ -345,9 +350,12 @@
window_half = settings.$window.height() / 2;
tipOffset = Math.ceil(settings.$target.offset().top - window_half + settings.$next_tip.outerHeight());

$("html, body").stop().animate({
scrollTop: tipOffset
}, settings.scrollSpeed);
if( settings.tipSettings.tipIsModal!="true")
{
$("html, body").stop().animate({
scrollTop: tipOffset
}, settings.scrollSpeed);
}
},

paused : function () {
Expand Down