|
@@ -162,13 +162,14 @@
|
|
slideshow: function( settings, keepPause ) {
|
|
slideshow: function( settings, keepPause ) {
|
|
var options = {
|
|
var options = {
|
|
step: step,
|
|
step: step,
|
|
- delay: 5000,
|
|
|
|
|
|
+ // delay: 5000,
|
|
preload: false,
|
|
preload: false,
|
|
backgrounds: backgrounds,
|
|
backgrounds: backgrounds,
|
|
walk: function() {}
|
|
walk: function() {}
|
|
};
|
|
};
|
|
- options = $.extend( {}, $.vegas.defaults.slideshow, options, settings );
|
|
|
|
-
|
|
|
|
|
|
+
|
|
|
|
+ $.extend( options, $.vegas.defaults.slideshow, settings );
|
|
|
|
+
|
|
if ( options.backgrounds != backgrounds ) {
|
|
if ( options.backgrounds != backgrounds ) {
|
|
if ( !settings.step ) {
|
|
if ( !settings.step ) {
|
|
options.step = 0;
|
|
options.step = 0;
|
|
@@ -181,7 +182,7 @@
|
|
|
|
|
|
backgrounds = options.backgrounds;
|
|
backgrounds = options.backgrounds;
|
|
step = options.step;
|
|
step = options.step;
|
|
-
|
|
|
|
|
|
+
|
|
clearInterval( timer );
|
|
clearInterval( timer );
|
|
|
|
|
|
if ( !backgrounds.length ) {
|
|
if ( !backgrounds.length ) {
|