Index: contrib/views_slideshow_singleframe/views_slideshow.js =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_singleframe/Attic/views_slideshow.js,v retrieving revision 1.1.2.1.2.4 diff -u -p -r1.1.2.1.2.4 views_slideshow.js --- contrib/views_slideshow_singleframe/views_slideshow.js 15 Sep 2009 07:25:06 -0000 1.1.2.1.2.4 +++ contrib/views_slideshow_singleframe/views_slideshow.js 16 Sep 2009 05:14:40 -0000 @@ -14,8 +14,7 @@ Drupal.behaviors.viewsSlideshowSingleFra var settings = Drupal.settings.viewsSlideshowSingleFrame[fullId]; settings.targetId = '#' + $(fullId + " :first").attr('id'); - $(settings.targetId).cycle({ - fx:settings.effect, + settings.opts = { speed:settings.speed, timeout:parseInt(settings.timeout), sync:settings.sync==1, @@ -26,7 +25,16 @@ Drupal.behaviors.viewsSlideshowSingleFra pager:(settings.pager > 0)?'#views_slideshow_pager_' + settings.id:null, cleartype:(settings.cleartype), cleartypeNoBg:(settings.cleartypenobg) - }); + } + + if (settings.effect == 'none') { + settings.opts.speed = 1; + } + else { + settings.opts.fx = settings.effect; + } + + $(settings.targetId).cycle(settings.opts); if (settings.controls > 0) { $('#views_slideshow_playpause_' + settings.id).click(function(e) { Index: contrib/views_slideshow_thumbnailhover/views_slideshow.js =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_thumbnailhover/Attic/views_slideshow.js,v retrieving revision 1.1.2.2.2.3 diff -u -p -r1.1.2.2.2.3 views_slideshow.js --- contrib/views_slideshow_thumbnailhover/views_slideshow.js 15 Sep 2009 07:25:06 -0000 1.1.2.2.2.3 +++ contrib/views_slideshow_thumbnailhover/views_slideshow.js 16 Sep 2009 05:14:40 -0000 @@ -14,7 +14,6 @@ Drupal.behaviors.viewsSlideshowThumbnail var settings = Drupal.settings.viewsSlideshowThumbnailHover[fullId]; settings.targetId = '#' + $(fullId + " :first").attr('id'); settings.opts = { - fx:settings.effect, speed:settings.speed, timeout:parseInt(settings.timeout), sync:settings.sync==1, @@ -36,6 +35,13 @@ Drupal.behaviors.viewsSlideshowThumbnail cleartype:(settings.cleartype), cleartypeNoBg:(settings.cleartypenobg) }; + + if (settings.effect == 'none') { + settings.opts.speed = 1; + } + else { + settings.opts.fx = settings.effect; + } $(settings.targetId).cycle(settings.opts);