"
Team:AUC TURKEY/Test
From 2013hs.igem.org
(Difference between revisions)
| Line 59: | Line 59: | ||
if (opts.width) | if (opts.width) | ||
$cont.width(opts.width); | $cont.width(opts.width); | ||
| - | if (opts.height | + | if (opts.height and opts.height != 'auto') |
$cont.height(opts.height); | $cont.height(opts.height); | ||
| Line 71: | Line 71: | ||
els[first].style.removeAttribute('filter'); | els[first].style.removeAttribute('filter'); | ||
| - | if (opts.fit | + | if (opts.fit and opts.width) |
$slides.width(opts.width); | $slides.width(opts.width); | ||
| - | if (opts.fit | + | if (opts.fit and opts.height and opts.height != 'auto') |
$slides.height(opts.height); | $slides.height(opts.height); | ||
if (opts.pause) | if (opts.pause) | ||
| Line 84: | Line 84: | ||
$slides.each(function() { | $slides.each(function() { | ||
var $el = $(this); | var $el = $(this); | ||
| - | this.cycleH = (opts.fit | + | this.cycleH = (opts.fit and opts.height) ? opts.height : $el.height(); |
| - | this.cycleW = (opts.fit | + | this.cycleW = (opts.fit and opts.width) ? opts.width : $el.width(); |
}); | }); | ||
| Line 114: | Line 114: | ||
opts.after[1].apply(e0, [e0, e0, opts, true]); | opts.after[1].apply(e0, [e0, e0, opts, true]); | ||
| - | if (opts.click | + | if (opts.click and !opts.next) |
opts.next = opts.click; | opts.next = opts.click; | ||
if (opts.next) | if (opts.next) | ||
| Line 132: | Line 132: | ||
return; | return; | ||
var p = els[0].parentNode, curr = els[opts.currSlide], next = els[opts.nextSlide]; | var p = els[0].parentNode, curr = els[opts.currSlide], next = els[opts.nextSlide]; | ||
| - | if (p.cycleTimeout === 0 | + | if (p.cycleTimeout === 0 and !manual) |
return; | return; | ||
Revision as of 09:15, 13 June 2013
