Skip to content

Commit 98b63e7

Browse files
author
Tyler Madsen
committed
added horiz_slide transition / last_step
1 parent be266c3 commit 98b63e7

File tree

1 file changed

+33
-1
lines changed

1 file changed

+33
-1
lines changed

lib/tc.merlin.js

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
use_hashchange:false,
5252
return_triggers_next:true,
5353

54-
transition:'none', // fade, slide, or none
54+
transition:'none', // fade, slide, horiz_slide, or none
5555
transition_speed:400,
5656

5757
first_step:null,
@@ -63,6 +63,7 @@
6363
steps:o.steps,
6464
data:{},
6565
current_step:null,
66+
last_step:null,
6667
progress_element:null,
6768
counters:{
6869
n_times_step_rendered:0
@@ -244,6 +245,9 @@
244245
return false;
245246
}
246247

248+
if ( internal.current_step ) {
249+
internal.last_step = internal.current_step;
250+
}
247251
internal.current_step = o.steps[step];
248252

249253
// begin transition handling
@@ -260,6 +264,34 @@
260264
} else {
261265
o.$e.find(internal.current_step.selector).show().siblings('.step').hide();
262266
}
267+
} else if (o.transition=='horiz_slide') {
268+
if (internal.counters.n_times_step_rendered !== 0) {
269+
270+
if ( internal.current_step.step_number > internal.last_step.step_number ) {
271+
272+
o.$e.find(internal.current_step.selector)
273+
.css({ left : '100%' })
274+
.show()
275+
.animate({ left : '0' }, o.transition_speed, 'linear');
276+
277+
o.$e.find(internal.last_step.selector)
278+
.animate({ left : '-100%' }, o.transition_speed, 'linear', function(){ $(this).hide(); });
279+
280+
} else if ( internal.current_step.step_number < internal.last_step.step_number ) {
281+
282+
o.$e.find(internal.current_step.selector)
283+
.css({ left : '-100%' })
284+
.show()
285+
.animate({ left : '0' }, o.transition_speed, 'linear');
286+
287+
o.$e.find(internal.last_step.selector)
288+
.animate({ left : '100%' }, o.transition_speed, 'linear', function(){ $(this).hide(); });
289+
290+
}
291+
292+
} else {
293+
o.$e.find(internal.current_step.selector).show().siblings('.step').hide();
294+
}
263295
} else {
264296
o.$e.find(internal.current_step.selector).show().siblings('.step').hide();
265297
}

0 commit comments

Comments
 (0)